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

Commit 5e59c236 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ->cds field from ide_hwif_t (take 2) 



* Use hwif->name instead of cds->name in ide_allocate_dma_engine().

* Use pci_name(dev) instead of cds->name in init_dma_pdc202xx().

* Remove no longer needed ->cds field from ide_hwif_t.

v2:

* scc_pata.c also needs to be updated now (noticed by Stephen Rothwell).

There should be no functional changes caused by this patch.

Cc: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Cc: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 0a79acd4

drivers/ide/ide-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ static int ide_allocate_dma_engine(ide_hwif_t *hwif) 
		return 0;



	printk(KERN_ERR "%s: -- Error, unable to allocate DMA table.\n",

	       hwif->cds->name);

			hwif->name);



	return 1;

}

drivers/ide/pci/pdc202xx_old.c

+3 −2
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif) 


static void __devinit init_dma_pdc202xx(ide_hwif_t *hwif, unsigned long dmabase)

{

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

	u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0;



	if (hwif->channel) {
@@ -300,14 +301,14 @@ static void __devinit init_dma_pdc202xx(ide_hwif_t *hwif, unsigned long dmabase) 
	secondary_mode	= inb(dmabase | 0x1b);

	printk(KERN_INFO "%s: (U)DMA Burst Bit %sABLED " \

		"Primary %s Mode " \

		"Secondary %s Mode.\n", hwif->cds->name,

		"Secondary %s Mode.\n", pci_name(dev),

		(udma_speed_flag & 1) ? "EN" : "DIS",

		(primary_mode & 1) ? "MASTER" : "PCI",

		(secondary_mode & 1) ? "MASTER" : "PCI" );



	if (!(udma_speed_flag & 1)) {

		printk(KERN_INFO "%s: FORCING BURST BIT 0x%02x->0x%02x ",

			hwif->cds->name, udma_speed_flag,

			pci_name(dev), udma_speed_flag,

			(udma_speed_flag|1));

		outb(udma_speed_flag | 1, dmabase | 0x1f);

		printk("%sACTIVE\n", (inb(dmabase | 0x1f) & 1) ? "" : "IN");

drivers/ide/pci/scc_pata.c

+0 −1
Original line number Diff line number Diff line
@@ -541,7 +541,6 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev, 
	hw.chipset = ide_pci;

	ide_init_port_hw(hwif, &hw);

	hwif->dev = &dev->dev;

	hwif->cds = d;



	idx[0] = hwif->index;

drivers/ide/setup-pci.c

+0 −1
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, 
	ide_init_port_hw(hwif, &hw);



	hwif->dev = &dev->dev;

	hwif->cds = d;



	return hwif;

}

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -446,8 +446,6 @@ typedef struct hwif_s { 


	struct device *dev;



	const struct ide_port_info *cds;	/* chipset device struct */



	ide_ack_intr_t *ack_intr;



	void (*rw_disk)(ide_drive_t *, struct request *);