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

Commit a5d8c5c8 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add ide_pci_device_t.host_flags (take 2) 



* Rename ide_pci_device_t.flags to ide_pci_device_t.host_flags
  and IDEPCI_FLAG_ISA_PORTS flag to IDE_HFLAG_ISA_PORTS.

* Add IDE_HFLAG_SINGLE flag for single channel devices.

* Convert core code and all IDE PCI drivers to use IDE_HFLAG_SINGLE
  and remove no longer needed ide_pci_device_t.channels field.

v2:
* Fix issues noticed by Sergei:
  - correct code alignment in scc_pata.c
  - s/IDE_HFLAG_SINGLE/~IDE_HFLAG_SINGLE/ in serverworks.c

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2229833c

drivers/ide/pci/aec62xx.c

+0 −5
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec62xx,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.channels	= 2,

		.autodma	= AUTODMA,

		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.bootable	= OFF_BOARD,
@@ -275,7 +274,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec62xx,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.channels	= 2,

		.autodma	= NOAUTODMA,

		.bootable	= OFF_BOARD,

		.udma_mask	= 0x1f, /* udma0-4 */
@@ -284,7 +282,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec62xx,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.channels	= 2,

		.autodma	= AUTODMA,

		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.bootable	= NEVER_BOARD,
@@ -294,7 +291,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec6x80,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.channels	= 2,

		.autodma	= AUTODMA,

		.bootable	= OFF_BOARD,

		.udma_mask	= 0x3f, /* udma0-5 */
@@ -303,7 +299,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec6x80,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.channels	= 2,

		.autodma	= AUTODMA,

		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.bootable	= OFF_BOARD,

drivers/ide/pci/alim15x3.c

+0 −1
Original line number Diff line number Diff line
@@ -817,7 +817,6 @@ static ide_pci_device_t ali15x3_chipset __devinitdata = { 
	.init_chipset	= init_chipset_ali15x3,

	.init_hwif	= init_hwif_ali15x3,

	.init_dma	= init_dma_ali15x3,

	.channels	= 2,

	.autodma	= AUTODMA,

	.bootable	= ON_BOARD,

};

drivers/ide/pci/amd74xx.c

+0 −2
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) 
		.name		= name_str,				\

		.init_chipset	= init_chipset_amd74xx,			\

		.init_hwif	= init_hwif_amd74xx,			\

		.channels	= 2,					\

		.autodma	= AUTODMA,				\

		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},	\

		.bootable	= ON_BOARD,				\
@@ -459,7 +458,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) 
		.name		= name_str,				\

		.init_chipset	= init_chipset_amd74xx,			\

		.init_hwif	= init_hwif_amd74xx,			\

		.channels	= 2,					\

		.autodma	= AUTODMA,				\

		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x01,0x01}},	\

		.bootable	= ON_BOARD,				\

drivers/ide/pci/atiixp.c

+1 −2
Original line number Diff line number Diff line
@@ -291,17 +291,16 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = { 
	{	/* 0 */

		.name		= "ATIIXP",

		.init_hwif	= init_hwif_atiixp,

		.channels	= 2,

		.autodma	= AUTODMA,

		.enablebits	= {{0x48,0x01,0x00}, {0x48,0x08,0x00}},

		.bootable	= ON_BOARD,

	},{	/* 1 */

		.name		= "SB600_PATA",

		.init_hwif	= init_hwif_atiixp,

		.channels	= 1,

		.autodma	= AUTODMA,

		.enablebits	= {{0x48,0x01,0x00}, {0x00,0x00,0x00}},

 		.bootable	= ON_BOARD,

 		.host_flags	= IDE_HFLAG_SINGLE,

 	},

};

drivers/ide/pci/cmd64x.c

+0 −4
Original line number Diff line number Diff line
@@ -617,7 +617,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_cmd64x,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.channels	= 2,

		.autodma	= AUTODMA,

		.enablebits	= {{0x00,0x00,0x00}, {0x51,0x08,0x08}},

		.bootable	= ON_BOARD,
@@ -627,7 +626,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_cmd646,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.channels	= 2,

		.autodma	= AUTODMA,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.bootable	= ON_BOARD,
@@ -637,7 +635,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_cmd64x,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.channels	= 2,

		.autodma	= AUTODMA,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.bootable	= ON_BOARD,
@@ -647,7 +644,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_cmd64x,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.channels	= 2,

		.autodma	= AUTODMA,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.bootable	= ON_BOARD,