Merge branch 'lsk-v4.4-eas-v5.2' of git://git.linaro.org/arm/eas/kernel.git

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / core / sdio_cis.c

diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
old mode 100755 (executable)
new mode 100644 (file)
index 25c9779..8e94e55
--- 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,19 +313,10 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
 
                        if (ret == -ENOENT) {
                                /* warn about unknown tuples */
-#if defined(CONFIG_SDMMC_RK29) && !defined(CONFIG_SDMMC_RK29_OLD)
-                // This is the normal exit procedure,rather than an error.noted by xbw at 2011-12-14
-                               printk(KERN_DEBUG "%s: queuing unknown"
+                               pr_warn_ratelimited("%s: queuing unknown"
                                       " CIS tuple 0x%02x (%u bytes)\n",
                                       mmc_hostname(card->host),
                                       tpl_code, tpl_link);
-#else
-                printk(KERN_WARNING "%s: queuing unknown"
-                                      " CIS tuple 0x%02x (%u bytes)\n",
-                                      mmc_hostname(card->host),
-                                      tpl_code, tpl_link);
-
-#endif
                        }
 
                        /* keep on analyzing tuples */