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

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

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

drivers/ata/ahci_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static struct scsi_host_template ahci_platform_sht = { 
	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 ahci_platform_data *pdata = dev_get_platdata(dev);

drivers/ata/ata_piix.c

+8 −9
Original line number Diff line number Diff line
@@ -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

 */



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;

	u16 cfg;
@@ -1296,7 +1296,7 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev) 
	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)

{

	struct pci_dev *pdev = to_pci_dev(host->dev);
@@ -1313,7 +1313,7 @@ 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,

				     const struct piix_map_db *map_db)

{
@@ -1392,7 +1392,7 @@ static bool piix_no_sidpr(struct ata_host *host) 
	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 piix_host_priv *hpriv = host->private_data;
@@ -1595,8 +1595,7 @@ static void piix_ignore_devices_quirk(struct ata_host *host) 
 *	Zero on success, or -ERRNO value.

 */



static int __devinit piix_init_one(struct pci_dev *pdev,

				   const struct pci_device_id *ent)

static int piix_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct device *dev = &pdev->dev;

	struct ata_port_info port_info[2];

drivers/ata/pata_arasan_cf.c

+3 −3
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static struct ata_port_operations arasan_cf_ops = { 
	.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_pdata *pdata = dev_get_platdata(&pdev->dev);
@@ -905,7 +905,7 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev) 
	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 arasan_cf_dev *acdev = host->ports[0]->private_data;
@@ -955,7 +955,7 @@ MODULE_DEVICE_TABLE(of, arasan_cf_id_table); 


static struct platform_driver arasan_cf_driver = {

	.probe		= arasan_cf_probe,

	.remove		= __devexit_p(arasan_cf_remove),

	.remove		= arasan_cf_remove,

	.driver		= {

		.name	= DRIVER_NAME,

		.owner	= THIS_MODULE,

drivers/ata/pata_at91.c

+3 −3
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static struct ata_port_operations pata_at91_port_ops = { 
	.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 device *dev = &pdev->dev;
@@ -420,7 +420,7 @@ static int __devinit pata_at91_probe(struct platform_device *pdev) 
	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 at91_ide_info *info;
@@ -441,7 +441,7 @@ static int __devexit pata_at91_remove(struct platform_device *pdev) 


static struct platform_driver pata_at91_driver = {

	.probe		= pata_at91_probe,

	.remove		= __devexit_p(pata_at91_remove),

	.remove		= pata_at91_remove,

	.driver		= {

		.name		= DRV_NAME,

		.owner		= THIS_MODULE,

drivers/ata/pata_bf54x.c

+3 −3
Original line number Diff line number Diff line
@@ -1538,7 +1538,7 @@ static unsigned short atapi_io_port[] = { 
 *		- 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;

	struct resource *res;
@@ -1608,7 +1608,7 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev) 
 *	A bfin atapi device has been unplugged. Perform the needed

 *	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 ata_host *host = dev_get_drvdata(dev);
@@ -1654,7 +1654,7 @@ static int bfin_atapi_resume(struct platform_device *pdev) 


static struct platform_driver bfin_atapi_driver = {

	.probe			= bfin_atapi_probe,

	.remove			= __devexit_p(bfin_atapi_remove),

	.remove			= bfin_atapi_remove,

	.suspend		= bfin_atapi_suspend,

	.resume			= bfin_atapi_resume,

	.driver = {