You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
mmc: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Chris Ball <cjb@laptop.org> Cc: Manuel Lauss <manuel.lauss@gmail.com> Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl> Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com> Cc: Venkatraman S <svenkatr@ti.com> Cc: Ian Molton <ian@mnementh.co.uk> Cc: Bruce Chang <brucechang@via.com.tw> Cc: Harald Welte <HaraldWelte@viatech.com> Cc: Pierre Ossman <pierre@ossman.eu> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
0433c14356
commit
c3be1efd41
@@ -511,7 +511,7 @@ static const struct of_device_id atmci_dt_ids[] = {
|
||||
|
||||
MODULE_DEVICE_TABLE(of, atmci_dt_ids);
|
||||
|
||||
static struct mci_platform_data __devinit*
|
||||
static struct mci_platform_data*
|
||||
atmci_of_init(struct platform_device *pdev)
|
||||
{
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
|
||||
@@ -943,7 +943,7 @@ static const struct mmc_host_ops au1xmmc_ops = {
|
||||
.enable_sdio_irq = au1xmmc_enable_sdio_irq,
|
||||
};
|
||||
|
||||
static int __devinit au1xmmc_probe(struct platform_device *pdev)
|
||||
static int au1xmmc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct mmc_host *mmc;
|
||||
struct au1xmmc_host *host;
|
||||
|
||||
@@ -522,7 +522,7 @@ static void sdh_reset(void)
|
||||
SSYNC();
|
||||
}
|
||||
|
||||
static int __devinit sdh_probe(struct platform_device *pdev)
|
||||
static int sdh_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct mmc_host *mmc;
|
||||
struct sdh_host *host;
|
||||
|
||||
@@ -690,7 +690,7 @@ static int cb710_mmc_resume(struct platform_device *pdev)
|
||||
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static int __devinit cb710_mmc_init(struct platform_device *pdev)
|
||||
static int cb710_mmc_init(struct platform_device *pdev)
|
||||
{
|
||||
struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
|
||||
struct cb710_chip *chip = cb710_slot_to_chip(slot);
|
||||
|
||||
@@ -37,7 +37,7 @@ static struct dw_mci_board pci_board_data = {
|
||||
.fifo_depth = 32,
|
||||
};
|
||||
|
||||
static int __devinit dw_mci_pci_probe(struct pci_dev *pdev,
|
||||
static int dw_mci_pci_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *entries)
|
||||
{
|
||||
struct dw_mci *host;
|
||||
|
||||
@@ -62,7 +62,7 @@ int dw_mci_pltfm_register(struct platform_device *pdev,
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dw_mci_pltfm_register);
|
||||
|
||||
static int __devinit dw_mci_pltfm_probe(struct platform_device *pdev)
|
||||
static int dw_mci_pltfm_probe(struct platform_device *pdev)
|
||||
{
|
||||
return dw_mci_pltfm_register(pdev, NULL);
|
||||
}
|
||||
|
||||
@@ -702,7 +702,7 @@ static const struct jz_gpio_bulk_request jz4740_mmc_pins[] = {
|
||||
JZ_GPIO_BULK_PIN(MSC_DATA3),
|
||||
};
|
||||
|
||||
static int __devinit jz4740_mmc_request_gpio(struct device *dev, int gpio,
|
||||
static int jz4740_mmc_request_gpio(struct device *dev, int gpio,
|
||||
const char *name, bool output, int value)
|
||||
{
|
||||
int ret;
|
||||
@@ -724,7 +724,7 @@ static int __devinit jz4740_mmc_request_gpio(struct device *dev, int gpio,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit jz4740_mmc_request_gpios(struct platform_device *pdev)
|
||||
static int jz4740_mmc_request_gpios(struct platform_device *pdev)
|
||||
{
|
||||
int ret;
|
||||
struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
|
||||
@@ -759,7 +759,7 @@ err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devinit jz4740_mmc_request_cd_irq(struct platform_device *pdev,
|
||||
static int jz4740_mmc_request_cd_irq(struct platform_device *pdev,
|
||||
struct jz4740_mmc_host *host)
|
||||
{
|
||||
struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
|
||||
@@ -802,7 +802,7 @@ static inline size_t jz4740_mmc_num_pins(struct jz4740_mmc_host *host)
|
||||
return num_pins;
|
||||
}
|
||||
|
||||
static int __devinit jz4740_mmc_probe(struct platform_device* pdev)
|
||||
static int jz4740_mmc_probe(struct platform_device* pdev)
|
||||
{
|
||||
int ret;
|
||||
struct mmc_host *mmc;
|
||||
|
||||
@@ -261,7 +261,7 @@ static void mmci_init_sg(struct mmci_host *host, struct mmc_data *data)
|
||||
* no custom DMA interfaces are supported.
|
||||
*/
|
||||
#ifdef CONFIG_DMA_ENGINE
|
||||
static void __devinit mmci_dma_setup(struct mmci_host *host)
|
||||
static void mmci_dma_setup(struct mmci_host *host)
|
||||
{
|
||||
struct mmci_platform_data *plat = host->plat;
|
||||
const char *rxname, *txname;
|
||||
@@ -337,7 +337,7 @@ static void __devinit mmci_dma_setup(struct mmci_host *host)
|
||||
}
|
||||
|
||||
/*
|
||||
* This is used in __devinit or __devexit so inline it
|
||||
* This is used in or __devexit so inline it
|
||||
* so it can be discarded.
|
||||
*/
|
||||
static inline void mmci_dma_release(struct mmci_host *host)
|
||||
@@ -1255,7 +1255,7 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit mmci_probe(struct amba_device *dev,
|
||||
static int mmci_probe(struct amba_device *dev,
|
||||
const struct amba_id *id)
|
||||
{
|
||||
struct mmci_platform_data *plat = dev->dev.platform_data;
|
||||
|
||||
@@ -1214,7 +1214,7 @@ static const struct mmc_host_ops mmc_omap_ops = {
|
||||
.set_ios = mmc_omap_set_ios,
|
||||
};
|
||||
|
||||
static int __devinit mmc_omap_new_slot(struct mmc_omap_host *host, int id)
|
||||
static int mmc_omap_new_slot(struct mmc_omap_host *host, int id)
|
||||
{
|
||||
struct mmc_omap_slot *slot = NULL;
|
||||
struct mmc_host *mmc;
|
||||
@@ -1309,7 +1309,7 @@ static void mmc_omap_remove_slot(struct mmc_omap_slot *slot)
|
||||
mmc_free_host(mmc);
|
||||
}
|
||||
|
||||
static int __devinit mmc_omap_probe(struct platform_device *pdev)
|
||||
static int mmc_omap_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct mmc_omap_host *host = NULL;
|
||||
|
||||
@@ -1715,7 +1715,7 @@ static inline struct omap_mmc_platform_data
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
|
||||
static int omap_hsmmc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct mmc_host *mmc;
|
||||
|
||||
@@ -584,7 +584,7 @@ static const struct of_device_id pxa_mmc_dt_ids[] = {
|
||||
|
||||
MODULE_DEVICE_TABLE(of, pxa_mmc_dt_ids);
|
||||
|
||||
static int __devinit pxamci_of_init(struct platform_device *pdev)
|
||||
static int pxamci_of_init(struct platform_device *pdev)
|
||||
{
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct pxamci_platform_data *pdata;
|
||||
@@ -614,7 +614,7 @@ static int __devinit pxamci_of_init(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
static int __devinit pxamci_of_init(struct platform_device *pdev)
|
||||
static int pxamci_of_init(struct platform_device *pdev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1540,7 +1540,7 @@ static inline void s3cmci_debugfs_remove(struct s3cmci_host *host) { }
|
||||
|
||||
#endif /* CONFIG_DEBUG_FS */
|
||||
|
||||
static int __devinit s3cmci_probe(struct platform_device *pdev)
|
||||
static int s3cmci_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct s3cmci_host *host;
|
||||
struct mmc_host *mmc;
|
||||
|
||||
@@ -95,7 +95,7 @@ static struct sdhci_pltfm_data sdhci_cns3xxx_pdata = {
|
||||
SDHCI_QUIRK_NONSTANDARD_CLOCK,
|
||||
};
|
||||
|
||||
static int __devinit sdhci_cns3xxx_probe(struct platform_device *pdev)
|
||||
static int sdhci_cns3xxx_probe(struct platform_device *pdev)
|
||||
{
|
||||
return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata);
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ static struct sdhci_pltfm_data sdhci_dove_pdata = {
|
||||
SDHCI_QUIRK_NO_HISPD_BIT,
|
||||
};
|
||||
|
||||
static int __devinit sdhci_dove_probe(struct platform_device *pdev)
|
||||
static int sdhci_dove_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct sdhci_host *host;
|
||||
struct sdhci_pltfm_host *pltfm_host;
|
||||
|
||||
@@ -403,7 +403,7 @@ static irqreturn_t cd_irq(int irq, void *data)
|
||||
};
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static int __devinit
|
||||
static int
|
||||
sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
|
||||
struct esdhc_platform_data *boarddata)
|
||||
{
|
||||
@@ -440,7 +440,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
|
||||
static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
|
||||
{
|
||||
const struct of_device_id *of_id =
|
||||
of_match_device(imx_esdhc_dt_ids, &pdev->dev);
|
||||
|
||||
@@ -208,7 +208,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata = {
|
||||
.ops = &sdhci_esdhc_ops,
|
||||
};
|
||||
|
||||
static int __devinit sdhci_esdhc_probe(struct platform_device *pdev)
|
||||
static int sdhci_esdhc_probe(struct platform_device *pdev)
|
||||
{
|
||||
return sdhci_pltfm_register(pdev, &sdhci_esdhc_pdata);
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ static struct sdhci_pltfm_data sdhci_hlwd_pdata = {
|
||||
.ops = &sdhci_hlwd_ops,
|
||||
};
|
||||
|
||||
static int __devinit sdhci_hlwd_probe(struct platform_device *pdev)
|
||||
static int sdhci_hlwd_probe(struct platform_device *pdev)
|
||||
{
|
||||
return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata);
|
||||
}
|
||||
|
||||
@@ -1183,7 +1183,7 @@ static const struct dev_pm_ops sdhci_pci_pm_ops = {
|
||||
* *
|
||||
\*****************************************************************************/
|
||||
|
||||
static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(
|
||||
static struct sdhci_pci_slot *sdhci_pci_probe_slot(
|
||||
struct pci_dev *pdev, struct sdhci_pci_chip *chip, int first_bar,
|
||||
int slotno)
|
||||
{
|
||||
@@ -1338,7 +1338,7 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)
|
||||
sdhci_free_host(slot->host);
|
||||
}
|
||||
|
||||
static void __devinit sdhci_pci_runtime_pm_allow(struct device *dev)
|
||||
static void sdhci_pci_runtime_pm_allow(struct device *dev)
|
||||
{
|
||||
pm_runtime_put_noidle(dev);
|
||||
pm_runtime_allow(dev);
|
||||
@@ -1353,7 +1353,7 @@ static void __devexit sdhci_pci_runtime_pm_forbid(struct device *dev)
|
||||
pm_runtime_get_noresume(dev);
|
||||
}
|
||||
|
||||
static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
|
||||
static int sdhci_pci_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
struct sdhci_pci_chip *chip;
|
||||
|
||||
@@ -166,7 +166,7 @@ static inline struct sdhci_pxa_platdata *pxav2_get_mmc_pdata(struct device *dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit sdhci_pxav2_probe(struct platform_device *pdev)
|
||||
static int sdhci_pxav2_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct sdhci_pltfm_host *pltfm_host;
|
||||
struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;
|
||||
|
||||
@@ -214,7 +214,7 @@ static inline struct sdhci_pxa_platdata *pxav3_get_mmc_pdata(struct device *dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit sdhci_pxav3_probe(struct platform_device *pdev)
|
||||
static int sdhci_pxav3_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct sdhci_pltfm_host *pltfm_host;
|
||||
struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user