Skip to content

L
linux
Commit 0ec24914 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Drivers: ata: 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, __devinitdata,
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: Jeff Garzik <jgarzik@pobox.com>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d8929942
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 94 deletions
drivers/ata/ahci_platform.c
View file @ 0ec24914
...@@ -86,7 +86,7 @@ static struct scsi_host_template ahci_platform_sht = { ...@@ -86,7 +86,7 @@ static struct scsi_host_template ahci_platform_sht = {
AHCI_SHT("ahci_platform"), AHCI_SHT("ahci_platform"),
}; };
static int __devinit ahci_probe(struct platform_device *pdev) static int ahci_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ahci_platform_data *pdata = dev_get_platdata(dev); struct ahci_platform_data *pdata = dev_get_platdata(dev);
......
drivers/ata/ata_piix.c
View file @ 0ec24914
...@@ -1270,7 +1270,7 @@ static int piix_disable_ahci(struct pci_dev *pdev) ...@@ -1270,7 +1270,7 @@ static int piix_disable_ahci(struct pci_dev *pdev)
* they are found return an error code so we can turn off DMA * they are found return an error code so we can turn off DMA
*/ */
static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev) static int piix_check_450nx_errata(struct pci_dev *ata_dev)
{ {
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
u16 cfg; u16 cfg;
...@@ -1296,8 +1296,8 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev) ...@@ -1296,8 +1296,8 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev)
return no_piix_dma; return no_piix_dma;
} }
static void __devinit piix_init_pcs(struct ata_host *host, static void piix_init_pcs(struct ata_host *host,
const struct piix_map_db *map_db) const struct piix_map_db *map_db)
{ {
struct pci_dev *pdev = to_pci_dev(host->dev); struct pci_dev *pdev = to_pci_dev(host->dev);
u16 pcs, new_pcs; u16 pcs, new_pcs;
...@@ -1313,9 +1313,9 @@ static void __devinit piix_init_pcs(struct ata_host *host, ...@@ -1313,9 +1313,9 @@ static void __devinit piix_init_pcs(struct ata_host *host,
} }
} }
static const int *__devinit piix_init_sata_map(struct pci_dev *pdev, static const int *piix_init_sata_map(struct pci_dev *pdev,
struct ata_port_info *pinfo, struct ata_port_info *pinfo,
const struct piix_map_db *map_db) const struct piix_map_db *map_db)
{ {
const int *map; const int *map;
int i, invalid_map = 0; int i, invalid_map = 0;
...@@ -1392,7 +1392,7 @@ static bool piix_no_sidpr(struct ata_host *host) ...@@ -1392,7 +1392,7 @@ static bool piix_no_sidpr(struct ata_host *host)
return false; return false;
} }
static int __devinit piix_init_sidpr(struct ata_host *host) static int piix_init_sidpr(struct ata_host *host)
{ {
struct pci_dev *pdev = to_pci_dev(host->dev); struct pci_dev *pdev = to_pci_dev(host->dev);
struct piix_host_priv *hpriv = host->private_data; struct piix_host_priv *hpriv = host->private_data;
...@@ -1595,8 +1595,7 @@ static void piix_ignore_devices_quirk(struct ata_host *host) ...@@ -1595,8 +1595,7 @@ static void piix_ignore_devices_quirk(struct ata_host *host)
* Zero on success, or -ERRNO value. * Zero on success, or -ERRNO value.
*/ */
static int __devinit piix_init_one(struct pci_dev *pdev, static int piix_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ata_port_info port_info[2]; struct ata_port_info port_info[2];
......
drivers/ata/pata_arasan_cf.c
View file @ 0ec24914
...@@ -791,7 +791,7 @@ static struct ata_port_operations arasan_cf_ops = { ...@@ -791,7 +791,7 @@ static struct ata_port_operations arasan_cf_ops = {
.set_dmamode = arasan_cf_set_dmamode, .set_dmamode = arasan_cf_set_dmamode,
}; };
static int __devinit arasan_cf_probe(struct platform_device *pdev) static int arasan_cf_probe(struct platform_device *pdev)
{ {
struct arasan_cf_dev *acdev; struct arasan_cf_dev *acdev;
struct arasan_cf_pdata *pdata = dev_get_platdata(&pdev->dev); struct arasan_cf_pdata *pdata = dev_get_platdata(&pdev->dev);
...@@ -905,7 +905,7 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev) ...@@ -905,7 +905,7 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit arasan_cf_remove(struct platform_device *pdev) static int arasan_cf_remove(struct platform_device *pdev)
{ {
struct ata_host *host = dev_get_drvdata(&pdev->dev); struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct arasan_cf_dev *acdev = host->ports[0]->private_data; struct arasan_cf_dev *acdev = host->ports[0]->private_data;
...@@ -955,7 +955,7 @@ MODULE_DEVICE_TABLE(of, arasan_cf_id_table); ...@@ -955,7 +955,7 @@ MODULE_DEVICE_TABLE(of, arasan_cf_id_table);
static struct platform_driver arasan_cf_driver = { static struct platform_driver arasan_cf_driver = {
.probe = arasan_cf_probe, .probe = arasan_cf_probe,
.remove = __devexit_p(arasan_cf_remove), .remove = arasan_cf_remove,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/ata/pata_at91.c
View file @ 0ec24914
...@@ -313,7 +313,7 @@ static struct ata_port_operations pata_at91_port_ops = { ...@@ -313,7 +313,7 @@ static struct ata_port_operations pata_at91_port_ops = {
.cable_detect = ata_cable_40wire, .cable_detect = ata_cable_40wire,
}; };
static int __devinit pata_at91_probe(struct platform_device *pdev) static int pata_at91_probe(struct platform_device *pdev)
{ {
struct at91_cf_data *board = pdev->dev.platform_data; struct at91_cf_data *board = pdev->dev.platform_data;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -420,7 +420,7 @@ static int __devinit pata_at91_probe(struct platform_device *pdev) ...@@ -420,7 +420,7 @@ static int __devinit pata_at91_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit pata_at91_remove(struct platform_device *pdev) static int pata_at91_remove(struct platform_device *pdev)
{ {
struct ata_host *host = dev_get_drvdata(&pdev->dev); struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct at91_ide_info *info; struct at91_ide_info *info;
...@@ -441,7 +441,7 @@ static int __devexit pata_at91_remove(struct platform_device *pdev) ...@@ -441,7 +441,7 @@ static int __devexit pata_at91_remove(struct platform_device *pdev)
static struct platform_driver pata_at91_driver = { static struct platform_driver pata_at91_driver = {
.probe = pata_at91_probe, .probe = pata_at91_probe,
.remove = __devexit_p(pata_at91_remove), .remove = pata_at91_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/ata/pata_bf54x.c
View file @ 0ec24914
...@@ -1538,7 +1538,7 @@ static unsigned short atapi_io_port[] = { ...@@ -1538,7 +1538,7 @@ static unsigned short atapi_io_port[] = {
* - IRQ (IORESOURCE_IRQ) * - IRQ (IORESOURCE_IRQ)
* *
*/ */
static int __devinit bfin_atapi_probe(struct platform_device *pdev) static int bfin_atapi_probe(struct platform_device *pdev)
{ {
int board_idx = 0; int board_idx = 0;
struct resource *res; struct resource *res;
...@@ -1608,7 +1608,7 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev) ...@@ -1608,7 +1608,7 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
* A bfin atapi device has been unplugged. Perform the needed * A bfin atapi device has been unplugged. Perform the needed
* cleanup. Also called on module unload for any active devices. * cleanup. Also called on module unload for any active devices.
*/ */
static int __devexit bfin_atapi_remove(struct platform_device *pdev) static int bfin_atapi_remove(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ata_host *host = dev_get_drvdata(dev); struct ata_host *host = dev_get_drvdata(dev);
...@@ -1654,7 +1654,7 @@ static int bfin_atapi_resume(struct platform_device *pdev) ...@@ -1654,7 +1654,7 @@ static int bfin_atapi_resume(struct platform_device *pdev)
static struct platform_driver bfin_atapi_driver = { static struct platform_driver bfin_atapi_driver = {
.probe = bfin_atapi_probe, .probe = bfin_atapi_probe,
.remove = __devexit_p(bfin_atapi_remove), .remove = bfin_atapi_remove,
.suspend = bfin_atapi_suspend, .suspend = bfin_atapi_suspend,
.resume = bfin_atapi_resume, .resume = bfin_atapi_resume,
.driver = { .driver = {
......
drivers/ata/pata_cs5520.c
View file @ 0ec24914
...@@ -115,7 +115,7 @@ static struct ata_port_operations cs5520_port_ops = { ...@@ -115,7 +115,7 @@ static struct ata_port_operations cs5520_port_ops = {
.set_piomode = cs5520_set_piomode, .set_piomode = cs5520_set_piomode,
}; };
static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_device_id *id) static int cs5520_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
static const unsigned int cmd_port[] = { 0x1F0, 0x170 }; static const unsigned int cmd_port[] = { 0x1F0, 0x170 };
static const unsigned int ctl_port[] = { 0x3F6, 0x376 }; static const unsigned int ctl_port[] = { 0x3F6, 0x376 };
......
drivers/ata/pata_ep93xx.c
View file @ 0ec24914
...@@ -910,7 +910,7 @@ static struct ata_port_operations ep93xx_pata_port_ops = { ...@@ -910,7 +910,7 @@ static struct ata_port_operations ep93xx_pata_port_ops = {
.port_start = ep93xx_pata_port_start, .port_start = ep93xx_pata_port_start,
}; };
static int __devinit ep93xx_pata_probe(struct platform_device *pdev) static int ep93xx_pata_probe(struct platform_device *pdev)
{ {
struct ep93xx_pata_data *drv_data; struct ep93xx_pata_data *drv_data;
struct ata_host *host; struct ata_host *host;
...@@ -1011,7 +1011,7 @@ static int __devinit ep93xx_pata_probe(struct platform_device *pdev) ...@@ -1011,7 +1011,7 @@ static int __devinit ep93xx_pata_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit ep93xx_pata_remove(struct platform_device *pdev) static int ep93xx_pata_remove(struct platform_device *pdev)
{ {
struct ata_host *host = platform_get_drvdata(pdev); struct ata_host *host = platform_get_drvdata(pdev);
struct ep93xx_pata_data *drv_data = host->private_data; struct ep93xx_pata_data *drv_data = host->private_data;
...@@ -1029,7 +1029,7 @@ static struct platform_driver ep93xx_pata_platform_driver = { ...@@ -1029,7 +1029,7 @@ static struct platform_driver ep93xx_pata_platform_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ep93xx_pata_probe, .probe = ep93xx_pata_probe,
.remove = __devexit_p(ep93xx_pata_remove), .remove = ep93xx_pata_remove,
}; };
module_platform_driver(ep93xx_pata_platform_driver); module_platform_driver(ep93xx_pata_platform_driver);
......
drivers/ata/pata_icside.c
View file @ 0ec24914
...@@ -337,10 +337,9 @@ static struct ata_port_operations pata_icside_port_ops = { ...@@ -337,10 +337,9 @@ static struct ata_port_operations pata_icside_port_ops = {
.port_start = ATA_OP_NULL, /* don't need PRD table */ .port_start = ATA_OP_NULL, /* don't need PRD table */
}; };
static void __devinit static void pata_icside_setup_ioaddr(struct ata_port *ap, void __iomem *base,
pata_icside_setup_ioaddr(struct ata_port *ap, void __iomem *base, struct pata_icside_info *info,
struct pata_icside_info *info, const struct portinfo *port)
const struct portinfo *port)
{ {
struct ata_ioports *ioaddr = &ap->ioaddr; struct ata_ioports *ioaddr = &ap->ioaddr;
void __iomem *cmd = base + port->dataoffset; void __iomem *cmd = base + port->dataoffset;
...@@ -368,7 +367,7 @@ pata_icside_setup_ioaddr(struct ata_port *ap, void __iomem *base, ...@@ -368,7 +367,7 @@ pata_icside_setup_ioaddr(struct ata_port *ap, void __iomem *base,
ata_port_desc(ap, "iocbase 0x%lx", info->raw_ioc_base); ata_port_desc(ap, "iocbase 0x%lx", info->raw_ioc_base);
} }
static int __devinit pata_icside_register_v5(struct pata_icside_info *info) static int pata_icside_register_v5(struct pata_icside_info *info)
{ {
struct pata_icside_state *state = info->state; struct pata_icside_state *state = info->state;
void __iomem *base; void __iomem *base;
...@@ -391,7 +390,7 @@ static int __devinit pata_icside_register_v5(struct pata_icside_info *info) ...@@ -391,7 +390,7 @@ static int __devinit pata_icside_register_v5(struct pata_icside_info *info)
return 0; return 0;
} }
static int __devinit pata_icside_register_v6(struct pata_icside_info *info) static int pata_icside_register_v6(struct pata_icside_info *info)
{ {
struct pata_icside_state *state = info->state; struct pata_icside_state *state = info->state;
struct expansion_card *ec = info->ec; struct expansion_card *ec = info->ec;
...@@ -434,7 +433,7 @@ static int __devinit pata_icside_register_v6(struct pata_icside_info *info) ...@@ -434,7 +433,7 @@ static int __devinit pata_icside_register_v6(struct pata_icside_info *info)
return icside_dma_init(info); return icside_dma_init(info);
} }
static int __devinit pata_icside_add_ports(struct pata_icside_info *info) static int pata_icside_add_ports(struct pata_icside_info *info)
{ {
struct expansion_card *ec = info->ec; struct expansion_card *ec = info->ec;
struct ata_host *host; struct ata_host *host;
...@@ -474,8 +473,8 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info) ...@@ -474,8 +473,8 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info)
&pata_icside_sht); &pata_icside_sht);
} }
static int __devinit static int pata_icside_probe(struct expansion_card *ec,
pata_icside_probe(struct expansion_card *ec, const struct ecard_id *id) const struct ecard_id *id)
{ {
struct pata_icside_state *state; struct pata_icside_state *state;
struct pata_icside_info info; struct pata_icside_info info;
...@@ -575,7 +574,7 @@ static void pata_icside_shutdown(struct expansion_card *ec) ...@@ -575,7 +574,7 @@ static void pata_icside_shutdown(struct expansion_card *ec)
} }
} }
static void __devexit pata_icside_remove(struct expansion_card *ec) static void pata_icside_remove(struct expansion_card *ec)
{ {
struct ata_host *host = ecard_get_drvdata(ec); struct ata_host *host = ecard_get_drvdata(ec);
struct pata_icside_state *state = host->private_data; struct pata_icside_state *state = host->private_data;
...@@ -602,7 +601,7 @@ static const struct ecard_id pata_icside_ids[] = { ...@@ -602,7 +601,7 @@ static const struct ecard_id pata_icside_ids[] = {
static struct ecard_driver pata_icside_driver = { static struct ecard_driver pata_icside_driver = {
.probe = pata_icside_probe, .probe = pata_icside_probe,
.remove = __devexit_p(pata_icside_remove), .remove = pata_icside_remove,
.shutdown = pata_icside_shutdown, .shutdown = pata_icside_shutdown,
.id_table = pata_icside_ids, .id_table = pata_icside_ids,
.drv = { .drv = {
......
drivers/ata/pata_imx.c
View file @ 0ec24914
...@@ -91,7 +91,7 @@ static void pata_imx_setup_port(struct ata_ioports *ioaddr) ...@@ -91,7 +91,7 @@ static void pata_imx_setup_port(struct ata_ioports *ioaddr)
ioaddr->command_addr = ioaddr->cmd_addr + (ATA_REG_CMD << 2); ioaddr->command_addr = ioaddr->cmd_addr + (ATA_REG_CMD << 2);
} }
static int __devinit pata_imx_probe(struct platform_device *pdev) static int pata_imx_probe(struct platform_device *pdev)
{ {
struct ata_host *host; struct ata_host *host;
struct ata_port *ap; struct ata_port *ap;
...@@ -167,7 +167,7 @@ static int __devinit pata_imx_probe(struct platform_device *pdev) ...@@ -167,7 +167,7 @@ static int __devinit pata_imx_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
static int __devexit pata_imx_remove(struct platform_device *pdev) static int pata_imx_remove(struct platform_device *pdev)
{ {
struct ata_host *host = dev_get_drvdata(&pdev->dev); struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct pata_imx_priv *priv = host->private_data; struct pata_imx_priv *priv = host->private_data;
...@@ -225,7 +225,7 @@ static const struct dev_pm_ops pata_imx_pm_ops = { ...@@ -225,7 +225,7 @@ static const struct dev_pm_ops pata_imx_pm_ops = {
static struct platform_driver pata_imx_driver = { static struct platform_driver pata_imx_driver = {
.probe = pata_imx_probe, .probe = pata_imx_probe,
.remove = __devexit_p(pata_imx_remove), .remove = pata_imx_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/ata/pata_ixp4xx_cf.c
View file @ 0ec24914
...@@ -137,7 +137,7 @@ static void ixp4xx_setup_port(struct ata_port *ap, ...@@ -137,7 +137,7 @@ static void ixp4xx_setup_port(struct ata_port *ap,
ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", raw_cmd, raw_ctl); ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", raw_cmd, raw_ctl);
} }
static __devinit int ixp4xx_pata_probe(struct platform_device *pdev) static int ixp4xx_pata_probe(struct platform_device *pdev)
{ {
unsigned int irq; unsigned int irq;
struct resource *cs0, *cs1; struct resource *cs0, *cs1;
......
drivers/ata/pata_macio.c
View file @ 0ec24914
...@@ -935,7 +935,7 @@ static struct ata_port_operations pata_macio_ops = { ...@@ -935,7 +935,7 @@ static struct ata_port_operations pata_macio_ops = {
.sff_irq_clear = pata_macio_irq_clear, .sff_irq_clear = pata_macio_irq_clear,
}; };
static void __devinit pata_macio_invariants(struct pata_macio_priv *priv) static void pata_macio_invariants(struct pata_macio_priv *priv)
{ {
const int *bidp; const int *bidp;
...@@ -976,9 +976,8 @@ static void __devinit pata_macio_invariants(struct pata_macio_priv *priv) ...@@ -976,9 +976,8 @@ static void __devinit pata_macio_invariants(struct pata_macio_priv *priv)
priv->aapl_bus_id = 1; priv->aapl_bus_id = 1;
} }
static void __devinit pata_macio_setup_ios(struct ata_ioports *ioaddr, static void pata_macio_setup_ios(struct ata_ioports *ioaddr,
void __iomem * base, void __iomem * base, void __iomem * dma)
void __iomem * dma)
{ {
/* cmd_addr is the base of regs for that port */ /* cmd_addr is the base of regs for that port */
ioaddr->cmd_addr = base; ioaddr->cmd_addr = base;
...@@ -999,8 +998,8 @@ static void __devinit pata_macio_setup_ios(struct ata_ioports *ioaddr, ...@@ -999,8 +998,8 @@ static void __devinit pata_macio_setup_ios(struct ata_ioports *ioaddr,
ioaddr->bmdma_addr = dma; ioaddr->bmdma_addr = dma;
} }
static void __devinit pmac_macio_calc_timing_masks(struct pata_macio_priv *priv, static void pmac_macio_calc_timing_masks(struct pata_macio_priv *priv,
struct ata_port_info *pinfo) struct ata_port_info *pinfo)
{ {
int i = 0; int i = 0;
...@@ -1027,11 +1026,11 @@ static void __devinit pmac_macio_calc_timing_masks(struct pata_macio_priv *priv, ...@@ -1027,11 +1026,11 @@ static void __devinit pmac_macio_calc_timing_masks(struct pata_macio_priv *priv,
pinfo->pio_mask, pinfo->mwdma_mask, pinfo->udma_mask); pinfo->pio_mask, pinfo->mwdma_mask, pinfo->udma_mask);
} }
static int __devinit pata_macio_common_init(struct pata_macio_priv *priv, static int pata_macio_common_init(struct pata_macio_priv *priv,
resource_size_t tfregs, resource_size_t tfregs,
resource_size_t dmaregs, resource_size_t dmaregs,
resource_size_t fcregs, resource_size_t fcregs,
unsigned long irq) unsigned long irq)
{ {
struct ata_port_info pinfo; struct ata_port_info pinfo;
const struct ata_port_info *ppi[] = { &pinfo, NULL }; const struct ata_port_info *ppi[] = { &pinfo, NULL };
...@@ -1113,8 +1112,8 @@ static int __devinit pata_macio_common_init(struct pata_macio_priv *priv, ...@@ -1113,8 +1112,8 @@ static int __devinit pata_macio_common_init(struct pata_macio_priv *priv,
&pata_macio_sht); &pata_macio_sht);
} }
static int __devinit pata_macio_attach(struct macio_dev *mdev, static int pata_macio_attach(struct macio_dev *mdev,
const struct of_device_id *match) const struct of_device_id *match)
{ {
struct pata_macio_priv *priv; struct pata_macio_priv *priv;
resource_size_t tfregs, dmaregs = 0; resource_size_t tfregs, dmaregs = 0;
...@@ -1190,7 +1189,7 @@ static int __devinit pata_macio_attach(struct macio_dev *mdev, ...@@ -1190,7 +1189,7 @@ static int __devinit pata_macio_attach(struct macio_dev *mdev,
return rc; return rc;
} }
static int __devexit pata_macio_detach(struct macio_dev *mdev) static int pata_macio_detach(struct macio_dev *mdev)
{ {
struct ata_host *host = macio_get_drvdata(mdev); struct ata_host *host = macio_get_drvdata(mdev);
struct pata_macio_priv *priv = host->private_data; struct pata_macio_priv *priv = host->private_data;
...@@ -1257,8 +1256,8 @@ static void pata_macio_mb_event(struct macio_dev* mdev, int mb_state) ...@@ -1257,8 +1256,8 @@ static void pata_macio_mb_event(struct macio_dev* mdev, int mb_state)
#endif /* CONFIG_PMAC_MEDIABAY */ #endif /* CONFIG_PMAC_MEDIABAY */
static int __devinit pata_macio_pci_attach(struct pci_dev *pdev, static int pata_macio_pci_attach(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct pata_macio_priv *priv; struct pata_macio_priv *priv;
struct device_node *np; struct device_node *np;
...@@ -1310,7 +1309,7 @@ static int __devinit pata_macio_pci_attach(struct pci_dev *pdev, ...@@ -1310,7 +1309,7 @@ static int __devinit pata_macio_pci_attach(struct pci_dev *pdev,
return 0; return 0;
} }
static void __devexit pata_macio_pci_detach(struct pci_dev *pdev) static void pata_macio_pci_detach(struct pci_dev *pdev)
{ {
struct ata_host *host = dev_get_drvdata(&pdev->dev); struct ata_host *host = dev_get_drvdata(&pdev->dev);
......
drivers/ata/pata_mpc52xx.c
View file @ 0ec24914
...@@ -621,9 +621,10 @@ static struct ata_port_operations mpc52xx_ata_port_ops = { ...@@ -621,9 +621,10 @@ static struct ata_port_operations mpc52xx_ata_port_ops = {
.qc_prep = ata_noop_qc_prep, .qc_prep = ata_noop_qc_prep,
}; };
static int __devinit static int mpc52xx_ata_init_one(struct device *dev,
mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv, struct mpc52xx_ata_priv *priv,
unsigned long raw_ata_regs, int mwdma_mask, int udma_mask) unsigned long raw_ata_regs,
int mwdma_mask, int udma_mask)
{ {
struct ata_host *host; struct ata_host *host;
struct ata_port *ap; struct ata_port *ap;
...@@ -667,8 +668,7 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv, ...@@ -667,8 +668,7 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv,
/* OF Platform driver */ /* OF Platform driver */
/* ======================================================================== */ /* ======================================================================== */
static int __devinit static int mpc52xx_ata_probe(struct platform_device *op)
mpc52xx_ata_probe(struct platform_device *op)
{ {
unsigned int ipb_freq; unsigned int ipb_freq;
struct resource res_mem; struct resource res_mem;
......
drivers/ata/pata_octeon_cf.c
View file @ 0ec24914
...@@ -840,7 +840,7 @@ static struct ata_port_operations octeon_cf_ops = { ...@@ -840,7 +840,7 @@ static struct ata_port_operations octeon_cf_ops = {
.dev_config = octeon_cf_dev_config, .dev_config = octeon_cf_dev_config,
}; };
static int __devinit octeon_cf_probe(struct platform_device *pdev) static int octeon_cf_probe(struct platform_device *pdev)
{ {
struct resource *res_cs0, *res_cs1; struct resource *res_cs0, *res_cs1;
......
drivers/ata/pata_of_platform.c
View file @ 0ec24914
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
#include <linux/libata.h> #include <linux/libata.h>
static int __devinit pata_of_platform_probe(struct platform_device *ofdev) static int pata_of_platform_probe(struct platform_device *ofdev)
{ {
int ret; int ret;
struct device_node *dn = ofdev->dev.of_node; struct device_node *dn = ofdev->dev.of_node;
......
drivers/ata/pata_palmld.c
View file @ 0ec24914
...@@ -48,7 +48,7 @@ static struct ata_port_operations palmld_port_ops = { ...@@ -48,7 +48,7 @@ static struct ata_port_operations palmld_port_ops = {
.cable_detect = ata_cable_40wire, .cable_detect = ata_cable_40wire,
}; };
static __devinit int palmld_pata_probe(struct platform_device *pdev) static int palmld_pata_probe(struct platform_device *pdev)
{ {
struct ata_host *host; struct ata_host *host;
struct ata_port *ap; struct ata_port *ap;
...@@ -109,7 +109,7 @@ static __devinit int palmld_pata_probe(struct platform_device *pdev) ...@@ -109,7 +109,7 @@ static __devinit int palmld_pata_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int palmld_pata_remove(struct platform_device *dev) static int palmld_pata_remove(struct platform_device *dev)
{ {
ata_platform_remove_one(dev); ata_platform_remove_one(dev);
...@@ -127,7 +127,7 @@ static struct platform_driver palmld_pata_platform_driver = { ...@@ -127,7 +127,7 @@ static struct platform_driver palmld_pata_platform_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = palmld_pata_probe, .probe = palmld_pata_probe,
.remove = __devexit_p(palmld_pata_remove), .remove = palmld_pata_remove,
}; };
module_platform_driver(palmld_pata_platform_driver); module_platform_driver(palmld_pata_platform_driver);
......
drivers/ata/pata_pdc2027x.c
View file @ 0ec24914
...@@ -700,7 +700,8 @@ static void pdc_ata_setup_port(struct ata_ioports *port, void __iomem *base) ...@@ -700,7 +700,8 @@ static void pdc_ata_setup_port(struct ata_ioports *port, void __iomem *base)
* @pdev: instance of pci_dev found * @pdev: instance of pci_dev found
* @ent: matching entry in the id_tbl[] * @ent: matching entry in the id_tbl[]
*/ */
static int __devinit pdc2027x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) static int pdc2027x_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{ {
static const unsigned long cmd_offset[] = { 0x17c0, 0x15c0 }; static const unsigned long cmd_offset[] = { 0x17c0, 0x15c0 };
static const unsigned long bmdma_offset[] = { 0x1000, 0x1008 }; static const unsigned long bmdma_offset[] = { 0x1000, 0x1008 };
......
drivers/ata/pata_platform.c
View file @ 0ec24914
...@@ -98,12 +98,9 @@ static void pata_platform_setup_port(struct ata_ioports *ioaddr, ...@@ -98,12 +98,9 @@ static void pata_platform_setup_port(struct ata_ioports *ioaddr,
* *
* If no IRQ resource is present, PIO polling mode is used instead. * If no IRQ resource is present, PIO polling mode is used instead.
*/ */
int __devinit __pata_platform_probe(struct device *dev, int __pata_platform_probe(struct device *dev, struct resource *io_res,
struct resource *io_res, struct resource *ctl_res, struct resource *irq_res,
struct resource *ctl_res, unsigned int ioport_shift, int __pio_mask)
struct resource *irq_res,
unsigned int ioport_shift,
int __pio_mask)
{ {
struct ata_host *host; struct ata_host *host;
struct ata_port *ap; struct ata_port *ap;
...@@ -178,7 +175,7 @@ int __devinit __pata_platform_probe(struct device *dev, ...@@ -178,7 +175,7 @@ int __devinit __pata_platform_probe(struct device *dev,
} }
EXPORT_SYMBOL_GPL(__pata_platform_probe); EXPORT_SYMBOL_GPL(__pata_platform_probe);
static int __devinit pata_platform_probe(struct platform_device *pdev) static int pata_platform_probe(struct platform_device *pdev)
{ {
struct resource *io_res; struct resource *io_res;
struct resource *ctl_res; struct resource *ctl_res;
......
drivers/ata/pata_pxa.c
View file @ 0ec24914
...@@ -229,7 +229,7 @@ static void pxa_ata_dma_irq(int dma, void *port) ...@@ -229,7 +229,7 @@ static void pxa_ata_dma_irq(int dma, void *port)
complete(&pd->dma_done); complete(&pd->dma_done);
} }
static int __devinit pxa_ata_probe(struct platform_device *pdev) static int pxa_ata_probe(struct platform_device *pdev)
{ {
struct ata_host *host; struct ata_host *host;
struct ata_port *ap; struct ata_port *ap;
...@@ -369,7 +369,7 @@ static int __devinit pxa_ata_probe(struct platform_device *pdev) ...@@ -369,7 +369,7 @@ static int __devinit pxa_ata_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit pxa_ata_remove(struct platform_device *pdev) static int pxa_ata_remove(struct platform_device *pdev)
{ {
struct ata_host *host = dev_get_drvdata(&pdev->dev); struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct pata_pxa_data *data = host->ports[0]->private_data; struct pata_pxa_data *data = host->ports[0]->private_data;
...@@ -383,7 +383,7 @@ static int __devexit pxa_ata_remove(struct platform_device *pdev) ...@@ -383,7 +383,7 @@ static int __devexit pxa_ata_remove(struct platform_device *pdev)
static struct platform_driver pxa_ata_driver = { static struct platform_driver pxa_ata_driver = {
.probe = pxa_ata_probe, .probe = pxa_ata_probe,
.remove = __devexit_p(pxa_ata_remove), .remove = pxa_ata_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/ata/pata_rb532_cf.c
View file @ 0ec24914
...@@ -102,7 +102,7 @@ static void rb532_pata_setup_ports(struct ata_host *ah) ...@@ -102,7 +102,7 @@ static void rb532_pata_setup_ports(struct ata_host *ah)
ap->ioaddr.error_addr = info->iobase + RB500_CF_REG_ERR; ap->ioaddr.error_addr = info->iobase + RB500_CF_REG_ERR;
} }
static __devinit int rb532_pata_driver_probe(struct platform_device *pdev) static int rb532_pata_driver_probe(struct platform_device *pdev)
{ {
int irq; int irq;
int gpio; int gpio;
...@@ -177,7 +177,7 @@ static __devinit int rb532_pata_driver_probe(struct platform_device *pdev) ...@@ -177,7 +177,7 @@ static __devinit int rb532_pata_driver_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int rb532_pata_driver_remove(struct platform_device *pdev) static int rb532_pata_driver_remove(struct platform_device *pdev)
{ {
struct ata_host *ah = platform_get_drvdata(pdev); struct ata_host *ah = platform_get_drvdata(pdev);
struct rb532_cf_info *info = ah->private_data; struct rb532_cf_info *info = ah->private_data;
...@@ -190,7 +190,7 @@ static __devexit int rb532_pata_driver_remove(struct platform_device *pdev) ...@@ -190,7 +190,7 @@ static __devexit int rb532_pata_driver_remove(struct platform_device *pdev)
static struct platform_driver rb532_pata_platform_driver = { static struct platform_driver rb532_pata_platform_driver = {
.probe = rb532_pata_driver_probe, .probe = rb532_pata_driver_probe,
.remove = __devexit_p(rb532_pata_driver_remove), .remove = rb532_pata_driver_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/ata/pata_rdc.c
View file @ 0ec24914
...@@ -321,8 +321,7 @@ static struct scsi_host_template rdc_sht = { ...@@ -321,8 +321,7 @@ static struct scsi_host_template rdc_sht = {
* Zero on success, or -ERRNO value. * Zero on success, or -ERRNO value.
*/ */
static int __devinit rdc_init_one(struct pci_dev *pdev, static int rdc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ata_port_info port_info[2]; struct ata_port_info port_info[2];
......
drivers/ata/pata_sch.c
View file @ 0ec24914
...@@ -169,8 +169,7 @@ static void sch_set_dmamode(struct ata_port *ap, struct ata_device *adev) ...@@ -169,8 +169,7 @@ static void sch_set_dmamode(struct ata_port *ap, struct ata_device *adev)
* Zero on success, or -ERRNO value. * Zero on success, or -ERRNO value.
*/ */
static int __devinit sch_init_one(struct pci_dev *pdev, static int sch_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
const struct ata_port_info *ppi[] = { &sch_port_info, NULL }; const struct ata_port_info *ppi[] = { &sch_port_info, NULL };
......
drivers/ata/pata_sil680.c
View file @ 0ec24914
...@@ -323,8 +323,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio) ...@@ -323,8 +323,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
return tmpbyte & 0x30; return tmpbyte & 0x30;
} }
static int __devinit sil680_init_one(struct pci_dev *pdev, static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
static const struct ata_port_info info = { static const struct ata_port_info info = {
.flags = ATA_FLAG_SLAVE_POSS, .flags = ATA_FLAG_SLAVE_POSS,
......
drivers/ata/sata_highbank.c
View file @ 0ec24914
...@@ -260,7 +260,7 @@ static const struct of_device_id ahci_of_match[] = { ...@@ -260,7 +260,7 @@ static const struct of_device_id ahci_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, ahci_of_match); MODULE_DEVICE_TABLE(of, ahci_of_match);
static int __devinit ahci_highbank_probe(struct platform_device *pdev) static int ahci_highbank_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
......
drivers/ata/sata_mv.c
View file @ 0ec24914
...@@ -4148,7 +4148,7 @@ static int mv_platform_probe(struct platform_device *pdev) ...@@ -4148,7 +4148,7 @@ static int mv_platform_probe(struct platform_device *pdev)
* A platform bus SATA device has been unplugged. Perform the needed * A platform bus SATA device has been unplugged. Perform the needed
* cleanup. Also called on module unload for any active devices. * cleanup. Also called on module unload for any active devices.
*/ */
static int __devexit mv_platform_remove(struct platform_device *pdev) static int mv_platform_remove(struct platform_device *pdev)
{ {
struct ata_host *host = platform_get_drvdata(pdev); struct ata_host *host = platform_get_drvdata(pdev);
#if defined(CONFIG_HAVE_CLK) #if defined(CONFIG_HAVE_CLK)
...@@ -4215,7 +4215,7 @@ static int mv_platform_resume(struct platform_device *pdev) ...@@ -4215,7 +4215,7 @@ static int mv_platform_resume(struct platform_device *pdev)
#endif #endif
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id mv_sata_dt_ids[] __devinitdata = { static struct of_device_id mv_sata_dt_ids[] = {
{ .compatible = "marvell,orion-sata", }, { .compatible = "marvell,orion-sata", },
{}, {},
}; };
...@@ -4224,7 +4224,7 @@ MODULE_DEVICE_TABLE(of, mv_sata_dt_ids); ...@@ -4224,7 +4224,7 @@ MODULE_DEVICE_TABLE(of, mv_sata_dt_ids);
static struct platform_driver mv_platform_driver = { static struct platform_driver mv_platform_driver = {
.probe = mv_platform_probe, .probe = mv_platform_probe,
.remove = __devexit_p(mv_platform_remove), .remove = mv_platform_remove,
.suspend = mv_platform_suspend, .suspend = mv_platform_suspend,
.resume = mv_platform_resume, .resume = mv_platform_resume,
.driver = { .driver = {
...@@ -4429,7 +4429,7 @@ static int mv_pci_device_resume(struct pci_dev *pdev) ...@@ -4429,7 +4429,7 @@ static int mv_pci_device_resume(struct pci_dev *pdev)
#endif #endif
static int mv_platform_probe(struct platform_device *pdev); static int mv_platform_probe(struct platform_device *pdev);
static int __devexit mv_platform_remove(struct platform_device *pdev); static int mv_platform_remove(struct platform_device *pdev);
static int __init mv_init(void) static int __init mv_init(void)
{ {
......
drivers/ata/sata_vsc.c
View file @ 0ec24914
...@@ -312,8 +312,7 @@ static struct ata_port_operations vsc_sata_ops = { ...@@ -312,8 +312,7 @@ static struct ata_port_operations vsc_sata_ops = {
.scr_write = vsc_sata_scr_write, .scr_write = vsc_sata_scr_write,
}; };
static void __devinit vsc_sata_setup_port(struct ata_ioports *port, static void vsc_sata_setup_port(struct ata_ioports *port, void __iomem *base)
void __iomem *base)
{ {
port->cmd_addr = base + VSC_SATA_TF_CMD_OFFSET; port->cmd_addr = base + VSC_SATA_TF_CMD_OFFSET;
port->data_addr = base + VSC_SATA_TF_DATA_OFFSET; port->data_addr = base + VSC_SATA_TF_DATA_OFFSET;
...@@ -335,8 +334,8 @@ static void __devinit vsc_sata_setup_port(struct ata_ioports *port, ...@@ -335,8 +334,8 @@ static void __devinit vsc_sata_setup_port(struct ata_ioports *port,
} }
static int __devinit vsc_sata_init_one(struct pci_dev *pdev, static int vsc_sata_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
static const struct ata_port_info pi = { static const struct ata_port_info pi = {
.flags = ATA_FLAG_SATA, .flags = ATA_FLAG_SATA,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7