leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: core: Use mmc_get_ext_csd() instead of mmc_send_ext_csd()

Browse Source 
By using mmc_get_ext_csd() in favor of mmc_send_ext_csd, we decrease
code duplication.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ulf Hansson 2014-10-17 11:48:23 +02:00
parent 86817ffb49
commit b2cada73a8
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/mmc/core/core.c
View File

@ -731,27 +731,16 @@ int mmc_read_bkops_status(struct mmc_card *card)
int err; int err;
u8 *ext_csd; u8 *ext_csd;
/*
* In future work, we should consider storing the entire ext_csd.
*/
ext_csd = kmalloc(512, GFP_KERNEL);
if (!ext_csd) {
pr_err("%s: could not allocate buffer to receive the ext_csd.\n",
mmc_hostname(card->host));
return -ENOMEM;
}
mmc_claim_host(card->host); mmc_claim_host(card->host);
err = mmc_send_ext_csd(card, ext_csd); err = mmc_get_ext_csd(card, &ext_csd);
mmc_release_host(card->host); mmc_release_host(card->host);
if (err) if (err)
goto out; return err;
card->ext_csd.raw_bkops_status = ext_csd[EXT_CSD_BKOPS_STATUS]; card->ext_csd.raw_bkops_status = ext_csd[EXT_CSD_BKOPS_STATUS];
card->ext_csd.raw_exception_status = ext_csd[EXT_CSD_EXP_EVENTS_STATUS]; card->ext_csd.raw_exception_status = ext_csd[EXT_CSD_EXP_EVENTS_STATUS];
out:
kfree(ext_csd); kfree(ext_csd);
return err; return 0;
} }
EXPORT_SYMBOL(mmc_read_bkops_status); EXPORT_SYMBOL(mmc_read_bkops_status);

9
drivers/mmc/core/debugfs.c
View File

@ -291,14 +291,8 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp)
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
ext_csd = kmalloc(512, GFP_KERNEL);
if (!ext_csd) {
err = -ENOMEM;
goto out_free;
}
mmc_get_card(card); mmc_get_card(card);
err = mmc_send_ext_csd(card, ext_csd); err = mmc_get_ext_csd(card, &ext_csd);
mmc_put_card(card); mmc_put_card(card);
if (err) if (err)
goto out_free; goto out_free;
@ -314,7 +308,6 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp)
out_free: out_free:
kfree(buf); kfree(buf);
kfree(ext_csd);
return err; return err;
} }