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

Commit 41051a14 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ->dma_vendor{1,3} fields from ide_hwif_t 



* Use 'hwif->dma_base + {1,3}' instead of hwif->dma_vendor{1,3} in
  pdc202xx_new host driver.

* Remove no longer needed ->dma_vendor{1,3} fields from ide_hwif_t.

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

drivers/ide/ide-dma.c

+0 −4
Original line number Diff line number Diff line
@@ -858,12 +858,8 @@ void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) 


	if (!hwif->dma_command)

		hwif->dma_command	= hwif->dma_base + 0;

	if (!hwif->dma_vendor1)

		hwif->dma_vendor1	= hwif->dma_base + 1;

	if (!hwif->dma_status)

		hwif->dma_status	= hwif->dma_base + 2;

	if (!hwif->dma_vendor3)

		hwif->dma_vendor3	= hwif->dma_base + 3;

	if (!hwif->dma_prdtable)

		hwif->dma_prdtable	= hwif->dma_base + 4;

drivers/ide/pci/pdc202xx_new.c

+4 −4
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ static u8 get_indexed_reg(ide_hwif_t *hwif, u8 index) 
{

	u8 value;



	outb(index, hwif->dma_vendor1);

	value = inb(hwif->dma_vendor3);

	outb(index, hwif->dma_base + 1);

	value = inb(hwif->dma_base + 3);



	DBG("index[%02X] value[%02X]\n", index, value);

	return value;
@@ -97,8 +97,8 @@ static u8 get_indexed_reg(ide_hwif_t *hwif, u8 index) 
 */

static void set_indexed_reg(ide_hwif_t *hwif, u8 index, u8 value)

{

	outb(index, hwif->dma_vendor1);

	outb(value, hwif->dma_vendor3);

	outb(index, hwif->dma_base + 1);

	outb(value, hwif->dma_base + 3);

	DBG("index[%02X] value[%02X]\n", index, value);

}

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -505,9 +505,7 @@ typedef struct hwif_s { 


	unsigned long	dma_base;	/* base addr for dma ports */

	unsigned long	dma_command;	/* dma command register */

	unsigned long	dma_vendor1;	/* dma vendor 1 register */

	unsigned long	dma_status;	/* dma status register */

	unsigned long	dma_vendor3;	/* dma vendor 3 register */

	unsigned long	dma_prdtable;	/* actual prd table address */



	unsigned long	config_data;	/* for use by chipset-specific code */