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

Commit 039788e1 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: replace ide_pci_device_t by struct ide_port_info 



* Rename struct ide_pci_device_s to struct ide_port_info.

* Remove ide_pci_device_t typedef.

While at it:

* Fix __ide_pci_register_driver() comment.

* Fix aec62xx_init_one() comment.

* Remove unused 'cds' field from ide_hwgroup_t.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 6157332e

drivers/ide/pci/aec62xx.c

+4 −4
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif) 
	}

}



static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {

static struct ide_port_info aec62xx_chipsets[] __devinitdata = {

	{	/* 0 */

		.name		= "AEC6210",

		.init_chipset	= init_chipset_aec62xx,
@@ -253,12 +253,12 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
 *	finds a device matching our IDE device tables.

 *

 *	NOTE: since we're going to modify the 'name' field for AEC-6[26]80[R]

 *	chips, pass a local copy of 'struct pci_device_id' down the call chain.

 *	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)

{

	ide_pci_device_t d;

	struct ide_port_info d;

	u8 idx = id->driver_data;



	d = aec62xx_chipsets[idx];

drivers/ide/pci/alim15x3.c

+2 −2
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase) 
	ide_setup_dma(hwif, dmabase, 8);

}



static ide_pci_device_t ali15x3_chipset __devinitdata = {

static struct ide_port_info ali15x3_chipset __devinitdata = {

	.name		= "ALI15X3",

	.init_chipset	= init_chipset_ali15x3,

	.init_hwif	= init_hwif_ali15x3,
@@ -772,7 +772,7 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev 
		{ },

	};



	ide_pci_device_t d = ali15x3_chipset;

	struct ide_port_info d = ali15x3_chipset;

	u8 rev = dev->revision;



	if (pci_dev_present(ati_rs100))

drivers/ide/pci/amd74xx.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct amd_ide_chip { 
};



static struct amd_ide_chip *amd_config;

static ide_pci_device_t *amd_chipset;

static struct ide_port_info *amd_chipset;

static unsigned int amd_80w;

static unsigned int amd_clock;
@@ -295,7 +295,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) 
		.mwdma_mask	= ATA_MWDMA2,				\

	}



static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {

static struct ide_port_info amd74xx_chipsets[] __devinitdata = {

	/*  0 */ DECLARE_AMD_DEV("AMD7401"),

	/*  1 */ DECLARE_AMD_DEV("AMD7409"),

	/*  2 */ DECLARE_AMD_DEV("AMD7411"),

drivers/ide/pci/atiixp.c

+1 −2
Original line number Diff line number Diff line
@@ -189,8 +189,7 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif) 
	hwif->dma_host_off = &atiixp_dma_host_off;

}





static ide_pci_device_t atiixp_pci_info[] __devinitdata = {

static struct ide_port_info atiixp_pci_info[] __devinitdata = {

	{	/* 0 */

		.name		= "ATIIXP",

		.init_hwif	= init_hwif_atiixp,

drivers/ide/pci/cmd64x.c

+2 −2
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif) 
	}

}



static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {

static struct ide_port_info cmd64x_chipsets[] __devinitdata = {

	{	/* 0 */

		.name		= "CMD643",

		.init_chipset	= init_chipset_cmd64x,
@@ -591,7 +591,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 


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

{

	ide_pci_device_t d;

	struct ide_port_info d;

	u8 idx = id->driver_data;



	d = cmd64x_chipsets[idx];