Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 453722b9 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Chris Ball
Browse files

mmc: make mmc_dev_to_card() macro public 



Conversion from struct device to struct mmc_card is used more than in one
place.  Due to this it's better to have public macro for such thing.

Signed-off-by: default avatarAndy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: Adrian Hunter <adrian.hunter@nokia.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 12578f66

drivers/mmc/card/mmc_test.c

+1 −3
Original line number Diff line number Diff line
@@ -1935,12 +1935,10 @@ static ssize_t mmc_test_show(struct device *dev, 
static ssize_t mmc_test_store(struct device *dev,

	struct device_attribute *attr, const char *buf, size_t count)

{

	struct mmc_card *card;

	struct mmc_card *card = dev_to_mmc_card(dev);

	struct mmc_test_card *test;

	int testcase;



	card = container_of(dev, struct mmc_card, dev);



	testcase = simple_strtol(buf, NULL, 10);



	test = kzalloc(sizeof(struct mmc_test_card), GFP_KERNEL);

drivers/mmc/core/bus.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "sdio_cis.h"

#include "bus.h"



#define dev_to_mmc_card(d)	container_of(d, struct mmc_card, dev)

#define to_mmc_driver(d)	container_of(d, struct mmc_driver, drv)



static ssize_t mmc_type_show(struct device *dev,

drivers/mmc/core/bus.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define MMC_DEV_ATTR(name, fmt, args...)					\

static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf)	\

{										\

	struct mmc_card *card = container_of(dev, struct mmc_card, dev);	\

	struct mmc_card *card = dev_to_mmc_card(dev);				\

	return sprintf(buf, fmt, args);						\

}										\

static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL)

include/linux/mmc/card.h

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ static inline int mmc_blksz_for_byte_mode(const struct mmc_card *c) 
#define mmc_card_name(c)	((c)->cid.prod_name)

#define mmc_card_id(c)		(dev_name(&(c)->dev))



#define dev_to_mmc_card(d)	container_of(d, struct mmc_card, dev)



#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)