renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

mmc: block: Use dev_set|get_drvdata()

Browse Source 
In most of the cases mmc_get|set_drvdata() didn't simplify code, which
should be the primary reason for such macros.

Let's remove them and convert to the common device_driver macros,
dev_set|get_drvdata() instead.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ulf Hansson 2014-10-06 14:34:09 +02:00
parent eaaceb6cbf
commit fc95e30ba3
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/mmc/card/block.c
View File

@ -112,7 +112,7 @@ struct mmc_blk_data {
/* /*
* Only set in main mmc_blk_data associated * Only set in main mmc_blk_data associated
* with mmc_card with mmc_set_drvdata, and keeps * with mmc_card with dev_set_drvdata, and keeps
* track of the current selected device partition. * track of the current selected device partition.
*/ */
unsigned int part_curr; unsigned int part_curr;
@ -642,7 +642,7 @@ static inline int mmc_blk_part_switch(struct mmc_card *card,
struct mmc_blk_data *md) struct mmc_blk_data *md)
{ {
int ret; int ret;
struct mmc_blk_data *main_md = mmc_get_drvdata(card); struct mmc_blk_data *main_md = dev_get_drvdata(&card->dev);
if (main_md->part_curr == md->part_type) if (main_md->part_curr == md->part_type)
return 0; return 0;
@ -1004,7 +1004,8 @@ static int mmc_blk_reset(struct mmc_blk_data *md, struct mmc_host *host,
err = mmc_hw_reset(host); err = mmc_hw_reset(host);
/* Ensure we switch back to the correct partition */ /* Ensure we switch back to the correct partition */
if (err != -EOPNOTSUPP) { if (err != -EOPNOTSUPP) {
struct mmc_blk_data *main_md = mmc_get_drvdata(host->card); struct mmc_blk_data *main_md =
dev_get_drvdata(&host->card->dev);
int part_err; int part_err;
main_md->part_curr = main_md->part_type; main_md->part_curr = main_md->part_type;
@ -2093,7 +2094,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
/* /*
* !subname implies we are creating main mmc_blk_data that will be * !subname implies we are creating main mmc_blk_data that will be
* associated with mmc_card with mmc_set_drvdata. Due to device * associated with mmc_card with dev_set_drvdata. Due to device
* partitions, devidx will not coincide with a per-physical card * partitions, devidx will not coincide with a per-physical card
* index anymore so we keep track of a name index. * index anymore so we keep track of a name index.
*/ */
@ -2452,7 +2453,7 @@ static int mmc_blk_probe(struct device *dev)
if (mmc_blk_alloc_parts(card, md)) if (mmc_blk_alloc_parts(card, md))
goto out; goto out;
mmc_set_drvdata(card, md); dev_set_drvdata(dev, md);
if (mmc_add_disk(md)) if (mmc_add_disk(md))
goto out; goto out;
@ -2485,7 +2486,7 @@ static int mmc_blk_probe(struct device *dev)
static int mmc_blk_remove(struct device *dev) static int mmc_blk_remove(struct device *dev)
{ {
struct mmc_card *card = mmc_dev_to_card(dev); struct mmc_card *card = mmc_dev_to_card(dev);
struct mmc_blk_data *md = mmc_get_drvdata(card); struct mmc_blk_data *md = dev_get_drvdata(dev);
mmc_blk_remove_parts(card, md); mmc_blk_remove_parts(card, md);
pm_runtime_get_sync(&card->dev); pm_runtime_get_sync(&card->dev);
@ -2496,7 +2497,7 @@ static int mmc_blk_remove(struct device *dev)
pm_runtime_disable(&card->dev); pm_runtime_disable(&card->dev);
pm_runtime_put_noidle(&card->dev); pm_runtime_put_noidle(&card->dev);
mmc_blk_remove_req(md); mmc_blk_remove_req(md);
mmc_set_drvdata(card, NULL); dev_set_drvdata(dev, NULL);
return 0; return 0;
} }
@ -2504,8 +2505,7 @@ static int mmc_blk_remove(struct device *dev)
static int _mmc_blk_suspend(struct device *dev) static int _mmc_blk_suspend(struct device *dev)
{ {
struct mmc_blk_data *part_md; struct mmc_blk_data *part_md;
struct mmc_card *card = mmc_dev_to_card(dev); struct mmc_blk_data *md = dev_get_drvdata(dev);
struct mmc_blk_data *md = mmc_get_drvdata(card);
if (md) { if (md) {
mmc_queue_suspend(&md->queue); mmc_queue_suspend(&md->queue);
@ -2530,8 +2530,7 @@ static int mmc_blk_suspend(struct device *dev)
static int mmc_blk_resume(struct device *dev) static int mmc_blk_resume(struct device *dev)
{ {
struct mmc_blk_data *part_md; struct mmc_blk_data *part_md;
struct mmc_card *card = mmc_dev_to_card(dev); struct mmc_blk_data *md = dev_get_drvdata(dev);
struct mmc_blk_data *md = mmc_get_drvdata(card);
if (md) { if (md) {
/* /*

2
include/linux/mmc/card.h
View File

@ -510,8 +510,6 @@ static inline int mmc_card_broken_irq_polling(const struct mmc_card *c)
#define mmc_dev_to_card(d) container_of(d, struct mmc_card, dev) #define mmc_dev_to_card(d) container_of(d, struct mmc_card, dev)
#define mmc_list_to_card(l) container_of(l, struct mmc_card, node) #define mmc_list_to_card(l) container_of(l, struct mmc_card, node)
#define mmc_get_drvdata(c) dev_get_drvdata(&(c)->dev)
#define mmc_set_drvdata(c,d) dev_set_drvdata(&(c)->dev, d)
extern int mmc_register_driver(struct device_driver *); extern int mmc_register_driver(struct device_driver *);
extern void mmc_unregister_driver(struct device_driver *); extern void mmc_unregister_driver(struct device_driver *);