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

Commit 9f36d314 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove hw_regs_t typedef 



Remove hw_regs_t typedef and rename struct hw_regs_s to struct ide_hw.

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 dca39830

drivers/ide/at91_ide.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ irqreturn_t at91_irq_handler(int irq, void *dev_id) 
static int __init at91_ide_probe(struct platform_device *pdev)

{

	int ret;

	hw_regs_t hw, *hws[] = { &hw };

	struct ide_hw hw, *hws[] = { &hw };

	struct ide_host *host;

	struct resource *res;

	unsigned long tf_base = 0, ctl_base = 0;

drivers/ide/au1xxx-ide.c

+2 −2
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d) 
}

#endif



static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif)

static void auide_setup_ports(struct ide_hw *hw, _auide_hwif *ahwif)

{

	int i;

	unsigned long *ata_regs = hw->io_ports_array;
@@ -508,7 +508,7 @@ static int au_ide_probe(struct platform_device *dev) 
	struct resource *res;

	struct ide_host *host;

	int ret = 0;

	hw_regs_t hw, *hws[] = { &hw };

	struct ide_hw hw, *hws[] = { &hw };



#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)

	char *mode = "MWDMA2";

drivers/ide/buddha.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int xsurf_ack_intr(ide_hwif_t *hwif) 
    return 1;

}



static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base,

static void __init buddha_setup_ports(struct ide_hw *hw, unsigned long base,

				      unsigned long ctl, unsigned long irq_port,

				      ide_ack_intr_t *ack_intr)

{
@@ -160,7 +160,7 @@ static int __init buddha_init(void) 


	while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {

		unsigned long board;

		hw_regs_t hw[MAX_NUM_HWIFS], *hws[MAX_NUM_HWIFS];

		struct ide_hw hw[MAX_NUM_HWIFS], *hws[MAX_NUM_HWIFS];



		if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA) {

			buddha_num_hwifs = BUDDHA_NUM_HWIFS;

drivers/ide/cmd640.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static int __init cmd640x_init(void) 
	int second_port_cmd640 = 0, rc;

	const char *bus_type, *port2;

	u8 b, cfr;

	hw_regs_t hw[2], *hws[2];

	struct ide_hw hw[2], *hws[2];



	if (cmd640_vlb && probe_for_cmd640_vlb()) {

		bus_type = "VLB";

drivers/ide/cs5520.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static const struct ide_port_info cyrix_chipset __devinitdata = { 
static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)

{

	const struct ide_port_info *d = &cyrix_chipset;

	hw_regs_t hw[2], *hws[] = { NULL, NULL };

	struct ide_hw hw[2], *hws[] = { NULL, NULL };



	ide_setup_pci_noise(dev, d);