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

Commit 898ec223 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove HWIF() macro 



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

drivers/ide/aec62xx.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static u8 pci_bus_clock_list_ultra (u8 speed, struct chipset_bus_clock_list_entr 


static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

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

	struct ide_host *host	= pci_get_drvdata(dev);

	struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;
@@ -111,7 +111,7 @@ static void aec6210_set_mode(ide_drive_t *drive, const u8 speed) 


static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

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

	struct ide_host *host	= pci_get_drvdata(dev);

	struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;

drivers/ide/alim15x3.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static struct pci_dev *isa_dev; 


static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)

{

	ide_hwif_t *hwif = HWIF(drive);

	ide_hwif_t *hwif = drive->hwif;

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

	struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);

	int s_time = t->setup, a_time = t->active, c_time = t->cycle;
@@ -150,7 +150,7 @@ static u8 ali_udma_filter(ide_drive_t *drive) 


static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

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

	u8 speed1		= speed;

	u8 unit			= drive->dn & 1;

drivers/ide/au1xxx-ide.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static void auide_set_dma_mode(ide_drive_t *drive, const u8 speed) 
static int auide_build_dmatable(ide_drive_t *drive)

{

	int i, iswrite, count = 0;

	ide_hwif_t *hwif = HWIF(drive);

	ide_hwif_t *hwif = drive->hwif;

	struct request *rq = hwif->rq;

	_auide_hwif *ahwif = &auide_hwif;

	struct scatterlist *sg;
@@ -286,7 +286,7 @@ static int auide_build_dmatable(ide_drive_t *drive) 


static int auide_dma_end(ide_drive_t *drive)

{

	ide_hwif_t *hwif = HWIF(drive);

	ide_hwif_t *hwif = drive->hwif;



	if (hwif->sg_nents) {

		ide_destroy_dmatable(drive);

drivers/ide/cmd64x.c

+7 −7
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_ 
 */

static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

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

	struct ide_timing *t	= ide_timing_find_mode(XFER_PIO_0 + pio);

	unsigned int cycle_time;
@@ -180,7 +180,7 @@ static void cmd64x_set_pio_mode(ide_drive_t *drive, const u8 pio) 


static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

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

	u8 unit			= drive->dn & 0x01;

	u8 regU = 0, pciU	= hwif->channel ? UDIDETCR1 : UDIDETCR0;
@@ -226,7 +226,7 @@ static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed) 


static int cmd648_dma_end(ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

	unsigned long base	= hwif->dma_base - (hwif->channel * 8);

	int err			= ide_dma_end(drive);

	u8  irq_mask		= hwif->channel ? MRDMODE_INTR_CH1 :
@@ -242,7 +242,7 @@ static int cmd648_dma_end(ide_drive_t *drive) 


static int cmd64x_dma_end(ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

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

	int irq_reg		= hwif->channel ? ARTTIM23 : CFR;

	u8  irq_mask		= hwif->channel ? ARTTIM23_INTR_CH1 :
@@ -259,7 +259,7 @@ static int cmd64x_dma_end(ide_drive_t *drive) 


static int cmd648_dma_test_irq(ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

	unsigned long base	= hwif->dma_base - (hwif->channel * 8);

	u8 irq_mask		= hwif->channel ? MRDMODE_INTR_CH1 :

						  MRDMODE_INTR_CH0;
@@ -282,7 +282,7 @@ static int cmd648_dma_test_irq(ide_drive_t *drive) 


static int cmd64x_dma_test_irq(ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

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

	int irq_reg		= hwif->channel ? ARTTIM23 : CFR;

	u8  irq_mask		= hwif->channel ? ARTTIM23_INTR_CH1 :
@@ -313,7 +313,7 @@ static int cmd64x_dma_test_irq(ide_drive_t *drive) 


static int cmd646_1_dma_end(ide_drive_t *drive)

{

	ide_hwif_t *hwif = HWIF(drive);

	ide_hwif_t *hwif = drive->hwif;

	u8 dma_stat = 0, dma_cmd = 0;



	drive->waiting_for_dma = 0;

drivers/ide/cs5520.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static struct pio_clocks cs5520_pio_clocks[]={ 


static void cs5520_set_pio_mode(ide_drive_t *drive, const u8 pio)

{

	ide_hwif_t *hwif = HWIF(drive);

	ide_hwif_t *hwif = drive->hwif;

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

	int controller = drive->dn > 1 ? 1 : 0;