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

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

Drivers: ide: 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,
__devinitconst, 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: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ec24914

drivers/ide/aec62xx.c

+4 −4
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = { 
	.cable_detect		= atp86x_cable_detect,

};



static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {

static const struct ide_port_info aec62xx_chipsets[] = {

	{	/* 0: AEC6210 */

		.name		= DRV_NAME,

		.init_chipset	= init_chipset_aec62xx,
@@ -251,7 +251,7 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitconst = { 
 *	chips, pass a local copy of 'struct ide_port_info' down the call chain.

 */



static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)

static int aec62xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)

{

	const struct chipset_bus_clock_list_entry *bus_clock;

	struct ide_port_info d;
@@ -287,7 +287,7 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi 
	return err;

}



static void __devexit aec62xx_remove(struct pci_dev *dev)

static void aec62xx_remove(struct pci_dev *dev)

{

	ide_pci_remove(dev);

	pci_disable_device(dev);
@@ -307,7 +307,7 @@ static struct pci_driver aec62xx_pci_driver = { 
	.name		= "AEC62xx_IDE",

	.id_table	= aec62xx_pci_tbl,

	.probe		= aec62xx_init_one,

	.remove		= __devexit_p(aec62xx_remove),

	.remove		= aec62xx_remove,

	.suspend	= ide_pci_suspend,

	.resume		= ide_pci_resume,

};

drivers/ide/alim15x3.c

+5 −5
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static u8 ali_cable_detect(ide_hwif_t *hwif) 
 *	Sparc systems.

 */



static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)

static void init_hwif_ali15x3(ide_hwif_t *hwif)

{

	u8 ideic, inmir;

	s8 irq_routing_table[] = { -1,  9, 3, 10, 4,  5, 7,  6,
@@ -464,8 +464,7 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) 
 *	Set up the DMA functionality on the ALi 15x3.

 */



static int __devinit init_dma_ali15x3(ide_hwif_t *hwif,

				      const struct ide_port_info *d)

static int init_dma_ali15x3(ide_hwif_t *hwif, const struct ide_port_info *d)

{

	struct pci_dev *dev = to_pci_dev(hwif->dev);

	unsigned long base = ide_pci_dma_base(hwif, d);
@@ -512,7 +511,7 @@ static const struct ide_dma_ops ali_dma_ops = { 
	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_port_info ali15x3_chipset __devinitconst = {

static const struct ide_port_info ali15x3_chipset = {

	.name		= DRV_NAME,

	.init_chipset	= init_chipset_ali15x3,

	.init_hwif	= init_hwif_ali15x3,
@@ -532,7 +531,8 @@ static const struct ide_port_info ali15x3_chipset __devinitconst = { 
 *	hot plug layer.

 */

 

static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_device_id *id)

static int alim15x3_init_one(struct pci_dev *dev,

			     const struct pci_device_id *id)

{

	struct ide_port_info d = ali15x3_chipset;

	u8 rev = dev->revision, idx = id->driver_data;

drivers/ide/amd74xx.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = { 
		.udma_mask	= udma,					\

	}



static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {

static const struct ide_port_info amd74xx_chipsets[] = {

	/* 0: AMD7401 */	DECLARE_AMD_DEV(0x00, ATA_UDMA2),

	/* 1: AMD7409 */	DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),

	/* 2: AMD7411/7441 */	DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
@@ -235,7 +235,7 @@ static const struct ide_port_info amd74xx_chipsets[] __devinitconst = { 
	/* 6: AMD5536 */	DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),

};



static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)

static int amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	struct ide_port_info d;

	u8 idx = id->driver_data;

drivers/ide/atiixp.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = { 
	.cable_detect		= atiixp_cable_detect,

};



static const struct ide_port_info atiixp_pci_info[] __devinitconst = {

static const struct ide_port_info atiixp_pci_info[] = {

	{	/* 0: IXP200/300/400/700 */

		.name		= DRV_NAME,

		.enablebits	= {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
@@ -168,7 +168,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitconst = { 
 *	finds a device matching our IDE device tables.

 */



static int __devinit atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)

static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)

{

	return ide_pci_init_one(dev, &atiixp_pci_info[id->driver_data], NULL);

}

drivers/ide/cmd64x.c

+2 −2
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = { 
	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {

static const struct ide_port_info cmd64x_chipsets[] = {

	{	/* 0: CMD643 */

		.name		= DRV_NAME,

		.init_chipset	= init_chipset_cmd64x,
@@ -373,7 +373,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitconst = { 
	}

};



static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)

static int cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)

{

	struct ide_port_info d;

	u8 idx = id->driver_data;