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

Commit 29e52cf7 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove chipset field from hw_regs_t 



* Convert host drivers that still use hw_regs_t's chipset field to use
  the one in struct ide_port_info instead.

* Move special handling of ide_pci chipset type from ide_hw_configure()
  to ide_init_port().

* Remove chipset field from hw_regs_t.

While at it:
- remove stale comment in delkin_cb.c

There should be no functional changes caused by this patch.

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

drivers/ide/at91_ide.c

+1 −1
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ static const struct ide_port_info at91_ide_port_info __initdata = { 
	.host_flags 	= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA | IDE_HFLAG_SINGLE |

			  IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_UNMASK_IRQS,

	.pio_mask 	= ATA_PIO6,

	.chipset	= ide_generic,

};



/*
@@ -304,7 +305,6 @@ static int __init at91_ide_probe(struct platform_device *pdev) 
		ide_std_init_ports(&hw, tf_base, ctl_base + 6);



	hw.irq = board->irq_pin;

	hw.chipset = ide_generic;

	hw.dev = &pdev->dev;



	host = ide_host_alloc(&at91_ide_port_info, hws);

drivers/ide/au1xxx-ide.c

+1 −1
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ static const struct ide_port_info au1xxx_port_info = { 
#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA

	.mwdma_mask		= ATA_MWDMA2,

#endif

	.chipset		= ide_au1xxx,

};



static int au_ide_probe(struct platform_device *dev)
@@ -548,7 +549,6 @@ static int au_ide_probe(struct platform_device *dev) 
	auide_setup_ports(&hw, ahwif);

	hw.irq = ahwif->irq;

	hw.dev = &dev->dev;

	hw.chipset = ide_au1xxx;



	ret = ide_host_add(&au1xxx_port_info, hws, &host);

	if (ret)

drivers/ide/buddha.c

+1 −2
Original line number Diff line number Diff line
@@ -139,13 +139,12 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base, 


	hw->irq = IRQ_AMIGA_PORTS;

	hw->ack_intr = ack_intr;



	hw->chipset = ide_generic;

}



static const struct ide_port_info buddha_port_info = {

	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,

	.irq_flags		= IRQF_SHARED,

	.chipset		= ide_generic,

};



    /*

drivers/ide/cmd640.c

+0 −2
Original line number Diff line number Diff line
@@ -762,11 +762,9 @@ static int __init cmd640x_init(void) 


	ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);

	hw[0].irq = 14;

	hw[0].chipset = ide_cmd640;



	ide_std_init_ports(&hw[1], 0x170, 0x376);

	hw[1].irq = 15;

	hw[1].chipset = ide_cmd640;



	printk(KERN_INFO "cmd640: buggy cmd640%c interface on %s, config=0x%02x"

			 "\n", 'a' + cmd640_chip_version - 1, bus_type, cfr);

drivers/ide/delkin_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ static const struct ide_port_info delkin_cb_port_info = { 
				  IDE_HFLAG_NO_DMA,

	.irq_flags		= IRQF_SHARED,

	.init_chipset		= delkin_cb_init_chipset,

	.chipset		= ide_pci,

};



static int __devinit
@@ -97,7 +98,6 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) 
	ide_std_init_ports(&hw, base + 0x10, base + 0x1e);

	hw.irq = dev->irq;

	hw.dev = &dev->dev;

	hw.chipset = ide_pci;		/* this enables IRQ sharing */



	rc = ide_host_add(&delkin_cb_port_info, hws, &host);

	if (rc)