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

Commit 21a3387d authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ->extra field from struct ide_port_info 



Always setup hwif->extra_base in ide_iomio_dma() and remove
no longer needed ->extra field from struct ide_port_info.

There should be no functional changes caused by this patch.

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

drivers/ide/ide-dma.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -850,7 +850,6 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base) 
	printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx",

	printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx",

	       hwif->name, base, base + 7);

	       hwif->name, base, base + 7);





	if (hwif->cds->extra)

	hwif->extra_base = base + (hwif->channel ? 8 : 16);

	hwif->extra_base = base + (hwif->channel ? 8 : 16);





	return 0;

	return 0;

drivers/ide/pci/hpt34x.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -130,7 +130,6 @@ static const struct ide_port_info hpt34x_chipsets[] __devinitdata = { 
	{ /* 0 */

	{ /* 0 */

		.name		= "HPT343",

		.name		= "HPT343",

		.init_chipset	= init_chipset_hpt34x,

		.init_chipset	= init_chipset_hpt34x,

		.extra		= 16,

		.port_ops	= &hpt34x_port_ops,

		.port_ops	= &hpt34x_port_ops,

		.host_flags	= IDE_HFLAGS_HPT34X | IDE_HFLAG_NON_BOOTABLE,

		.host_flags	= IDE_HFLAGS_HPT34X | IDE_HFLAG_NON_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.pio_mask	= ATA_PIO5,
@@ -138,7 +137,6 @@ static const struct ide_port_info hpt34x_chipsets[] __devinitdata = { 
	{ /* 1 */

	{ /* 1 */

		.name		= "HPT345",

		.name		= "HPT345",

		.init_chipset	= init_chipset_hpt34x,

		.init_chipset	= init_chipset_hpt34x,

		.extra		= 16,

		.port_ops	= &hpt34x_port_ops,

		.port_ops	= &hpt34x_port_ops,

		.host_flags	= IDE_HFLAGS_HPT34X | IDE_HFLAG_OFF_BOARD,

		.host_flags	= IDE_HFLAGS_HPT34X | IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO5,

		.pio_mask	= ATA_PIO5,

drivers/ide/pci/hpt366.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1428,7 +1428,6 @@ static const struct ide_port_info hpt366_chipsets[] __devinitdata = { 
		 * Bit 4 is for the primary channel, bit 5 for the secondary.

		 * Bit 4 is for the primary channel, bit 5 for the secondary.

		 */

		 */

		.enablebits	= {{0x50,0x10,0x10}, {0x54,0x04,0x04}},

		.enablebits	= {{0x50,0x10,0x10}, {0x54,0x04,0x04}},

		.extra		= 240,

		.port_ops	= &hpt3xx_port_ops,

		.port_ops	= &hpt3xx_port_ops,

		.host_flags	= IDE_HFLAGS_HPT3XX | IDE_HFLAG_SINGLE,

		.host_flags	= IDE_HFLAGS_HPT3XX | IDE_HFLAG_SINGLE,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,
@@ -1439,7 +1438,6 @@ static const struct ide_port_info hpt366_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_hpt366,

		.init_hwif	= init_hwif_hpt366,

		.init_dma	= init_dma_hpt366,

		.init_dma	= init_dma_hpt366,

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.extra		= 240,

		.port_ops	= &hpt3xx_port_ops,

		.port_ops	= &hpt3xx_port_ops,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,
@@ -1450,7 +1448,6 @@ static const struct ide_port_info hpt366_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_hpt366,

		.init_hwif	= init_hwif_hpt366,

		.init_dma	= init_dma_hpt366,

		.init_dma	= init_dma_hpt366,

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.extra		= 240,

		.port_ops	= &hpt3xx_port_ops,

		.port_ops	= &hpt3xx_port_ops,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,
@@ -1461,7 +1458,6 @@ static const struct ide_port_info hpt366_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_hpt366,

		.init_hwif	= init_hwif_hpt366,

		.init_dma	= init_dma_hpt366,

		.init_dma	= init_dma_hpt366,

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.extra		= 240,

		.port_ops	= &hpt3xx_port_ops,

		.port_ops	= &hpt3xx_port_ops,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,
@@ -1473,7 +1469,6 @@ static const struct ide_port_info hpt366_chipsets[] __devinitdata = { 
		.init_dma	= init_dma_hpt366,

		.init_dma	= init_dma_hpt366,

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.udma_mask	= ATA_UDMA5,

		.udma_mask	= ATA_UDMA5,

		.extra		= 240,

		.port_ops	= &hpt3xx_port_ops,

		.port_ops	= &hpt3xx_port_ops,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,
@@ -1484,7 +1479,6 @@ static const struct ide_port_info hpt366_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_hpt366,

		.init_hwif	= init_hwif_hpt366,

		.init_dma	= init_dma_hpt366,

		.init_dma	= init_dma_hpt366,

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.enablebits	= {{0x50,0x04,0x04}, {0x54,0x04,0x04}},

		.extra		= 240,

		.port_ops	= &hpt3xx_port_ops,

		.port_ops	= &hpt3xx_port_ops,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.host_flags	= IDE_HFLAGS_HPT3XX,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,

drivers/ide/pci/pdc202xx_old.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -358,7 +358,6 @@ static const struct ide_port_ops pdc2026x_port_ops = { 
		.init_chipset	= init_chipset_pdc202xx, \

		.init_chipset	= init_chipset_pdc202xx, \

		.init_hwif	= init_hwif_pdc202xx, \

		.init_hwif	= init_hwif_pdc202xx, \

		.init_dma	= init_dma_pdc202xx, \

		.init_dma	= init_dma_pdc202xx, \

		.extra		= 48, \

		.port_ops	= &pdc2026x_port_ops, \

		.port_ops	= &pdc2026x_port_ops, \

		.host_flags	= IDE_HFLAGS_PDC202XX | extra_flags, \

		.host_flags	= IDE_HFLAGS_PDC202XX | extra_flags, \

		.pio_mask	= ATA_PIO4, \

		.pio_mask	= ATA_PIO4, \
@@ -373,7 +372,6 @@ static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_pdc202xx,

		.init_hwif	= init_hwif_pdc202xx,

		.init_dma	= init_dma_pdc202xx,

		.init_dma	= init_dma_pdc202xx,

		.port_ops	= &pdc20246_port_ops,

		.port_ops	= &pdc20246_port_ops,

		.extra		= 16,

		.host_flags	= IDE_HFLAGS_PDC202XX,

		.host_flags	= IDE_HFLAGS_PDC202XX,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.mwdma_mask	= ATA_MWDMA2,

include/linux/ide.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -1111,7 +1111,6 @@ struct ide_port_info { 




	ide_pci_enablebit_t	enablebits[2];

	ide_pci_enablebit_t	enablebits[2];

	hwif_chipset_t		chipset;

	hwif_chipset_t		chipset;

	u8			extra;

	u32			host_flags;

	u32			host_flags;

	u8			pio_mask;

	u8			pio_mask;

	u8			swdma_mask;

	u8			swdma_mask;