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

Commit 9239b333 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove write-only hwif->hw 



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

drivers/ide/arm/icside.c

+0 −5
Original line number Diff line number Diff line
@@ -450,8 +450,6 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e 
	if (hwif) {

		int i;



		memset(&hwif->hw, 0, sizeof(hw_regs_t));



		/*

		 * Ensure we're using MMIO

		 */
@@ -459,13 +457,10 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e 
		hwif->mmio = 1;



		for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {

			hwif->hw.io_ports[i] = port;

			hwif->io_ports[i] = port;

			port += 1 << info->stepping;

		}

		hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)base + info->ctrloffset;

		hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)base + info->ctrloffset;

		hwif->hw.irq  = ec->irq;

		hwif->irq     = ec->irq;

		hwif->noprobe = 0;

		hwif->chipset = ide_acorn;

drivers/ide/arm/rapide.c

+1 −3
Original line number Diff line number Diff line
@@ -24,13 +24,11 @@ rapide_locate_hwif(void __iomem *base, void __iomem *ctrl, unsigned int sz, int 
		goto out;



	for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {

		hwif->hw.io_ports[i] = port;

		hwif->io_ports[i] = port;

		port += sz;

	}

	hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;

	hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;

	hwif->hw.irq = hwif->irq = irq;

	hwif->irq = irq;

	hwif->mmio = 1;

	default_hwif_mmiops(hwif);

out:

drivers/ide/ide.c

+8 −7
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ static void init_hwif_default(ide_hwif_t *hwif, unsigned int index) 


	ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, &hwif->irq);



	memcpy(&hwif->hw, &hw, sizeof(hw));

	memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports));



	hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
@@ -214,7 +213,7 @@ static void __init init_ide_data (void) 
		init_hwif_data(hwif, index);

		init_hwif_default(hwif, index);

#if !defined(CONFIG_PPC32) || !defined(CONFIG_PCI)

		hwif->irq = hwif->hw.irq =

		hwif->irq =

			ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);

#endif

	}
@@ -730,8 +729,7 @@ int ide_register_hw(hw_regs_t *hw, void (*fixup)(ide_hwif_t *), 
	}

	if (hwif->present)

		return -1;

	memcpy(&hwif->hw, hw, sizeof(*hw));

	memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));

	memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports));

	hwif->irq = hw->irq;

	hwif->noprobe = 0;

	hwif->fixup = fixup;
@@ -1417,6 +1415,9 @@ static int __init ide_setup(char *s) 
			"reset", "minus6", "ata66", "minus8", "minus9",

			"minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",

			"dtc2278", "umc8672", "ali14xx", NULL };



		hw_regs_t hwregs;



		hw = s[3] - '0';

		hwif = &ide_hwifs[hw];

		i = match_parm(&s[4], ide_words, vals, 3);
@@ -1526,9 +1527,9 @@ static int __init ide_setup(char *s) 
			case 2: /* base,ctl */

				vals[2] = 0;	/* default irq = probe for it */

			case 3: /* base,ctl,irq */

				hwif->hw.irq = vals[2];

				ide_init_hwif_ports(&hwif->hw, (unsigned long) vals[0], (unsigned long) vals[1], &hwif->irq);

				memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));

				memset(&hwregs, 0, sizeof(hwregs));

				ide_init_hwif_ports(&hwregs, vals[0], vals[1], &hwif->irq);

				memcpy(hwif->io_ports, hwregs.io_ports, sizeof(hwif->io_ports));

				hwif->irq      = vals[2];

				hwif->noprobe  = 0;

				hwif->chipset  = ide_forced;

drivers/ide/legacy/ide_platform.c

+5 −6
Original line number Diff line number Diff line
@@ -39,19 +39,18 @@ static ide_hwif_t *__devinit plat_ide_locate_hwif(void __iomem *base, 
	if (hwif == NULL)

		goto out;



	hwif->hw.io_ports[IDE_DATA_OFFSET] = port;

	hwif->io_ports[IDE_DATA_OFFSET] = port;



	port += (1 << pdata->ioport_shift);

	for (i = IDE_ERROR_OFFSET; i <= IDE_STATUS_OFFSET;

	     i++, port += (1 << pdata->ioport_shift))

		hwif->hw.io_ports[i] = port;

		hwif->io_ports[i] = port;



	hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;

	hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;



	memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));

	hwif->hw.irq = hwif->irq = irq;

	hwif->irq = irq;



	hwif->chipset = hwif->hw.chipset = ide_generic;

	hwif->chipset = ide_generic;



	if (mmio) {

		hwif->mmio = 1;

drivers/ide/mips/au1xxx-ide.c

+5 −5
Original line number Diff line number Diff line
@@ -601,9 +601,9 @@ static int au_ide_probe(struct device *dev) 
	_auide_hwif *ahwif = &auide_hwif;

	ide_hwif_t *hwif;

	struct resource *res;

	hw_regs_t *hw;

	int ret = 0;

	u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };

	hw_regs_t hw;



#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)

	char *mode = "MWDMA2";
@@ -645,12 +645,12 @@ static int au_ide_probe(struct device *dev) 
	/* FIXME:  This might possibly break PCMCIA IDE devices */



	hwif                            = &ide_hwifs[pdev->id];

	hw 				= &hwif->hw;

	hwif->irq = hw->irq             = ahwif->irq;

	hwif->irq			= ahwif->irq;

	hwif->chipset                   = ide_au1xxx;



	auide_setup_ports(hw, ahwif);

	memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports));

	memset(&hw, 0, sizeof(hw));

	auide_setup_ports(&hw, ahwif);

	memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));



	hwif->ultra_mask                = 0x0;  /* Disable Ultra DMA */

#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA