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

Commit 76287748 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

mmc: core: Handle card shutdown from mmc_bus 



Considering shutdown of the card, the responsibility to initate this
sequence shall be driven from the mmc_bus.

This patch enables the mmc_bus to handle this sequence properly. A new
.shutdown callback is added in the mmc_driver struct which is used to
shutdown the blk device.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 986892ca

drivers/mmc/card/block.c

+13 −2
Original line number Diff line number Diff line
@@ -2403,8 +2403,7 @@ static void mmc_blk_remove(struct mmc_card *card) 
	mmc_set_drvdata(card, NULL);

}



#ifdef CONFIG_PM

static int mmc_blk_suspend(struct mmc_card *card)

static int _mmc_blk_suspend(struct mmc_card *card)

{

	struct mmc_blk_data *part_md;

	struct mmc_blk_data *md = mmc_get_drvdata(card);
@@ -2419,6 +2418,17 @@ static int mmc_blk_suspend(struct mmc_card *card) 
	return 0;

}



static void mmc_blk_shutdown(struct mmc_card *card)

{

	_mmc_blk_suspend(card);

}



#ifdef CONFIG_PM

static int mmc_blk_suspend(struct mmc_card *card)

{

	return _mmc_blk_suspend(card);

}



static int mmc_blk_resume(struct mmc_card *card)

{

	struct mmc_blk_data *part_md;
@@ -2451,6 +2461,7 @@ static struct mmc_driver mmc_driver = { 
	.remove		= mmc_blk_remove,

	.suspend	= mmc_blk_suspend,

	.resume		= mmc_blk_resume,

	.shutdown	= mmc_blk_shutdown,

};



static int __init mmc_blk_init(void)

drivers/mmc/card/mmc_test.c

+5 −0
Original line number Diff line number Diff line
@@ -3025,12 +3025,17 @@ static void mmc_test_remove(struct mmc_card *card) 
	mmc_test_free_dbgfs_file(card);

}



static void mmc_test_shutdown(struct mmc_card *card)

{

}



static struct mmc_driver mmc_driver = {

	.drv		= {

		.name	= "mmc_test",

	},

	.probe		= mmc_test_probe,

	.remove		= mmc_test_remove,

	.shutdown	= mmc_test_shutdown,

};



static int __init mmc_test_init(void)

drivers/mmc/core/bus.c

+9 −0
Original line number Diff line number Diff line
@@ -122,6 +122,14 @@ static int mmc_bus_remove(struct device *dev) 
	return 0;

}



static void mmc_bus_shutdown(struct device *dev)

{

	struct mmc_driver *drv = to_mmc_driver(dev->driver);

	struct mmc_card *card = mmc_dev_to_card(dev);



	drv->shutdown(card);

}



#ifdef CONFIG_PM_SLEEP

static int mmc_bus_suspend(struct device *dev)

{
@@ -205,6 +213,7 @@ static struct bus_type mmc_bus_type = { 
	.uevent		= mmc_bus_uevent,

	.probe		= mmc_bus_probe,

	.remove		= mmc_bus_remove,

	.shutdown	= mmc_bus_shutdown,

	.pm		= &mmc_bus_pm_ops,

};

include/linux/mmc/card.h

+1 −0
Original line number Diff line number Diff line
@@ -520,6 +520,7 @@ struct mmc_driver { 
	void (*remove)(struct mmc_card *);

	int (*suspend)(struct mmc_card *);

	int (*resume)(struct mmc_card *);

	void (*shutdown)(struct mmc_card *);

};



extern int mmc_register_driver(struct mmc_driver *);