Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[cascardo/linux.git] / drivers / mmc / core / sdio_cis.c

diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index 541bdb8..f1c7ed8 100644 (file)
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -132,7 +132,7 @@ static int cis_tpl_parse(struct mmc_card *card, struct sdio_func *func,
                        ret = -EINVAL;
                }
                if (ret && ret != -EILSEQ && ret != -ENOENT) {
-                       printk(KERN_ERR "%s: bad %s tuple 0x%02x (%u bytes)\n",
+                       pr_err("%s: bad %s tuple 0x%02x (%u bytes)\n",
                               mmc_hostname(card->host), tpl_descr, code, size);
                }
        } else {
@@ -313,7 +313,7 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
 
                        if (ret == -ENOENT) {
                                /* warn about unknown tuples */
-                               printk(KERN_WARNING "%s: queuing unknown"
+                               pr_warning("%s: queuing unknown"
                                       " CIS tuple 0x%02x (%u bytes)\n",
                                       mmc_hostname(card->host),
                                       tpl_code, tpl_link);