aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajendra Nayak <rnayak@ti.com>2012-02-23 06:32:20 -0500
committerChris Ball <cjb@laptop.org>2012-03-27 12:20:06 -0400
commit2cecdf002300bca86ce83b17a60f907d5a4ce7dc (patch)
tree89ead24d3b979befa82a3353dfcd592be9533c69
parent183f796b5f701f8ab530ab232e4c27aef527bd76 (diff)
mmc: omap_hsmmc: convert all pr_* to dev_*
Convert all instances of pr_* prints within the driver to instead use dev_* prints. Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--drivers/mmc/host/omap_hsmmc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 94d463859e9b..0306aea329d4 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -301,7 +301,7 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
301 mmc_slot(host).ocr_mask = ocr_value; 301 mmc_slot(host).ocr_mask = ocr_value;
302 } else { 302 } else {
303 if (!(mmc_slot(host).ocr_mask & ocr_value)) { 303 if (!(mmc_slot(host).ocr_mask & ocr_value)) {
304 pr_err("MMC ocrmask %x is not supported\n", 304 dev_err(host->dev, "ocrmask %x is not supported\n",
305 mmc_slot(host).ocr_mask); 305 mmc_slot(host).ocr_mask);
306 mmc_slot(host).ocr_mask = 0; 306 mmc_slot(host).ocr_mask = 0;
307 return -EINVAL; 307 return -EINVAL;
@@ -1131,14 +1131,14 @@ static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host)
1131 host->reqs_blocked = 0; 1131 host->reqs_blocked = 0;
1132 if (mmc_slot(host).get_cover_state(host->dev, host->slot_id)) { 1132 if (mmc_slot(host).get_cover_state(host->dev, host->slot_id)) {
1133 if (host->protect_card) { 1133 if (host->protect_card) {
1134 pr_info("%s: cover is closed, " 1134 dev_info(host->dev, "%s: cover is closed, "
1135 "card is now accessible\n", 1135 "card is now accessible\n",
1136 mmc_hostname(host->mmc)); 1136 mmc_hostname(host->mmc));
1137 host->protect_card = 0; 1137 host->protect_card = 0;
1138 } 1138 }
1139 } else { 1139 } else {
1140 if (!host->protect_card) { 1140 if (!host->protect_card) {
1141 pr_info("%s: cover is open, " 1141 dev_info(host->dev, "%s: cover is open, "
1142 "card is now inaccessible\n", 1142 "card is now inaccessible\n",
1143 mmc_hostname(host->mmc)); 1143 mmc_hostname(host->mmc));
1144 host->protect_card = 1; 1144 host->protect_card = 1;
@@ -1275,7 +1275,7 @@ static int omap_hsmmc_pre_dma_transfer(struct omap_hsmmc_host *host,
1275 1275
1276 if (!next && data->host_cookie && 1276 if (!next && data->host_cookie &&
1277 data->host_cookie != host->next_data.cookie) { 1277 data->host_cookie != host->next_data.cookie) {
1278 pr_warning("[%s] invalid cookie: data->host_cookie %d" 1278 dev_warn(host->dev, "[%s] invalid cookie: data->host_cookie %d"
1279 " host->next_data.cookie %d\n", 1279 " host->next_data.cookie %d\n",
1280 __func__, data->host_cookie, host->next_data.cookie); 1280 __func__, data->host_cookie, host->next_data.cookie);
1281 data->host_cookie = 0; 1281 data->host_cookie = 0;