|
@@ -301,7 +301,7 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
|
|
|
mmc_slot(host).ocr_mask = ocr_value;
|
|
|
} else {
|
|
|
if (!(mmc_slot(host).ocr_mask & ocr_value)) {
|
|
|
- pr_err("MMC ocrmask %x is not supported\n",
|
|
|
+ dev_err(host->dev, "ocrmask %x is not supported\n",
|
|
|
mmc_slot(host).ocr_mask);
|
|
|
mmc_slot(host).ocr_mask = 0;
|
|
|
return -EINVAL;
|
|
@@ -1131,14 +1131,14 @@ static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host)
|
|
|
host->reqs_blocked = 0;
|
|
|
if (mmc_slot(host).get_cover_state(host->dev, host->slot_id)) {
|
|
|
if (host->protect_card) {
|
|
|
- pr_info("%s: cover is closed, "
|
|
|
+ dev_info(host->dev, "%s: cover is closed, "
|
|
|
"card is now accessible\n",
|
|
|
mmc_hostname(host->mmc));
|
|
|
host->protect_card = 0;
|
|
|
}
|
|
|
} else {
|
|
|
if (!host->protect_card) {
|
|
|
- pr_info("%s: cover is open, "
|
|
|
+ dev_info(host->dev, "%s: cover is open, "
|
|
|
"card is now inaccessible\n",
|
|
|
mmc_hostname(host->mmc));
|
|
|
host->protect_card = 1;
|
|
@@ -1275,7 +1275,7 @@ static int omap_hsmmc_pre_dma_transfer(struct omap_hsmmc_host *host,
|
|
|
|
|
|
if (!next && data->host_cookie &&
|
|
|
data->host_cookie != host->next_data.cookie) {
|
|
|
- pr_warning("[%s] invalid cookie: data->host_cookie %d"
|
|
|
+ dev_warn(host->dev, "[%s] invalid cookie: data->host_cookie %d"
|
|
|
" host->next_data.cookie %d\n",
|
|
|
__func__, data->host_cookie, host->next_data.cookie);
|
|
|
data->host_cookie = 0;
|