Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security

[pandora-kernel.git] / drivers / mmc / core / sdio_irq.c

diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c
index 03ead02..b644dd5 100644 (file)
--- a/drivers/mmc/core/sdio_irq.c
+++ b/drivers/mmc/core/sdio_irq.c
@@ -45,7 +45,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
 
        ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTx, 0, &pending);
        if (ret) {
-               printk(KERN_DEBUG "%s: error %d reading SDIO_CCCR_INTx\n",
+               pr_debug("%s: error %d reading SDIO_CCCR_INTx\n",
                       mmc_card_id(card), ret);
                return ret;
        }
@@ -55,7 +55,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
                if (pending & (1 << i)) {
                        func = card->sdio_func[i - 1];
                        if (!func) {
-                               printk(KERN_WARNING "%s: pending IRQ for "
+                               pr_warning("%s: pending IRQ for "
                                        "non-existent function\n",
                                        mmc_card_id(card));
                                ret = -EINVAL;
@@ -63,7 +63,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
                                func->irq_handler(func);
                                count++;
                        } else {
-                               printk(KERN_WARNING "%s: pending IRQ with no handler\n",
+                               pr_warning("%s: pending IRQ with no handler\n",
                                       sdio_func_id(func));
                                ret = -EINVAL;
                        }