openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Drivers: mmc: remove __dev* attributes. 

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Chris Ball <cjb@laptop.org>
Cc: Tony Prisk <linux@prisktech.co.nz>
Cc: Will Newton <will.newton@imgtec.com>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Thomas Abraham <thomas.abraham@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 15:05:47 -08:00
parent d34d6517ea
commit 4e608e4ed9
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mmc/host/dw_mmc-pci.c
View File

@ -134,7 +134,7 @@ static struct pci_driver dw_mci_pci_driver = {
.name = "dw_mmc_pci", .name = "dw_mmc_pci",
.id_table = dw_mci_pci_id, .id_table = dw_mci_pci_id,
.probe = dw_mci_pci_probe, .probe = dw_mci_pci_probe,
.remove = __devexit_p(dw_mci_pci_remove), .remove = dw_mci_pci_remove,
.driver = { .driver = {
.pm = &dw_mci_pci_pmops .pm = &dw_mci_pci_pmops
}, },

2
drivers/mmc/host/dw_mmc-pltfm.c
View File

@ -120,7 +120,7 @@ MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
static struct platform_driver dw_mci_pltfm_driver = { static struct platform_driver dw_mci_pltfm_driver = {
.probe = dw_mci_pltfm_probe, .probe = dw_mci_pltfm_probe,
.remove = __devexit_p(dw_mci_pltfm_remove), .remove = dw_mci_pltfm_remove,
.driver = { .driver = {
.name = "dw_mmc", .name = "dw_mmc",
.of_match_table = of_match_ptr(dw_mci_pltfm_match), .of_match_table = of_match_ptr(dw_mci_pltfm_match),

6
drivers/mmc/host/sdhci-acpi.c
View File

@ -111,7 +111,7 @@ static const struct sdhci_acpi_slot *sdhci_acpi_get_slot(const char *hid)
return NULL; return NULL;
} }
static int __devinit sdhci_acpi_probe(struct platform_device *pdev) static int sdhci_acpi_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
acpi_handle handle = ACPI_HANDLE(dev); acpi_handle handle = ACPI_HANDLE(dev);
@ -214,7 +214,7 @@ static int __devinit sdhci_acpi_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit sdhci_acpi_remove(struct platform_device *pdev) static int sdhci_acpi_remove(struct platform_device *pdev)
{ {
struct sdhci_acpi_host *c = platform_get_drvdata(pdev); struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -302,7 +302,7 @@ static struct platform_driver sdhci_acpi_driver = {
.pm = &sdhci_acpi_pm_ops, .pm = &sdhci_acpi_pm_ops,
}, },
.probe = sdhci_acpi_probe, .probe = sdhci_acpi_probe,
.remove = __devexit_p(sdhci_acpi_remove), .remove = sdhci_acpi_remove,
}; };
module_platform_driver(sdhci_acpi_driver); module_platform_driver(sdhci_acpi_driver);

4
drivers/mmc/host/wmt-sdmmc.c
View File

@ -766,7 +766,7 @@ static struct of_device_id wmt_mci_dt_ids[] = {
{ /* Sentinel */ }, { /* Sentinel */ },
}; };
static int __devinit wmt_mci_probe(struct platform_device *pdev) static int wmt_mci_probe(struct platform_device *pdev)
{ {
struct mmc_host *mmc; struct mmc_host *mmc;
struct wmt_mci_priv *priv; struct wmt_mci_priv *priv;
@ -892,7 +892,7 @@ static int __devinit wmt_mci_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit wmt_mci_remove(struct platform_device *pdev) static int wmt_mci_remove(struct platform_device *pdev)
{ {
struct mmc_host *mmc; struct mmc_host *mmc;
struct wmt_mci_priv *priv; struct wmt_mci_priv *priv;