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

Commit 6dc4a47a authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

[ARM] 5420/1: MMCI devinit and devexit macros 



This adds __devinit and __devexit macros to the module probe and
remove functions in MMCI. Now includes the __devexit_p() thing too.

Signed-off-by: default avatarLinus Walleij <linus.walleij@ericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bff22c9b

drivers/mmc/host/mmci.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -490,7 +490,7 @@ static void mmci_check_status(unsigned long data) 
	mod_timer(&host->timer, jiffies + HZ);

	mod_timer(&host->timer, jiffies + HZ);

}

}





static int mmci_probe(struct amba_device *dev, void *id)

static int __devinit mmci_probe(struct amba_device *dev, void *id)

{

{

	struct mmc_platform_data *plat = dev->dev.platform_data;

	struct mmc_platform_data *plat = dev->dev.platform_data;

	struct mmci_host *host;

	struct mmci_host *host;
@@ -633,7 +633,7 @@ static int mmci_probe(struct amba_device *dev, void *id) 
	return ret;

	return ret;

}

}





static int mmci_remove(struct amba_device *dev)

static int __devexit mmci_remove(struct amba_device *dev)

{

{

	struct mmc_host *mmc = amba_get_drvdata(dev);

	struct mmc_host *mmc = amba_get_drvdata(dev);
@@ -730,7 +730,7 @@ static struct amba_driver mmci_driver = { 
		.name	= DRIVER_NAME,

		.name	= DRIVER_NAME,

	},

	},

	.probe		= mmci_probe,

	.probe		= mmci_probe,

	.remove		= mmci_remove,

	.remove		= __devexit_p(mmci_remove),

	.suspend	= mmci_suspend,

	.suspend	= mmci_suspend,

	.resume		= mmci_resume,

	.resume		= mmci_resume,

	.id_table	= mmci_ids,

	.id_table	= mmci_ids,