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

ide: add ide_deprecated_find_port() helper 



* Factor out code for finding ide_hwifs[] slot from ide_register_hw()
  to ide_deprecated_find_port().

* Convert bast-ide, ide-cs and delkin_cb host drivers to use ide_device_add()
  instead of ide_register_hw() (while at it drop doing "ide_unregister()" loop
  which tries to unregister _all_ IDE interfaces if useable ide_hwifs[] slot
  cannot be find).

This patch leaves us with only two ide_register_hw() users:
- drivers/macintosh/mediabay.c
- drivers/ide/ide.c

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

drivers/ide/arm/bast-ide.c

+19 −1
Original line number Diff line number Diff line
@@ -28,8 +28,10 @@ static int __init 
bastide_register(unsigned int base, unsigned int aux, int irq,

		 ide_hwif_t **hwif)

{

	ide_hwif_t *hwif;

	hw_regs_t hw;

	int i;

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



	memset(&hw, 0, sizeof(hw));
@@ -44,8 +46,24 @@ bastide_register(unsigned int base, unsigned int aux, int irq, 
	hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);

	hw.irq = irq;



	ide_register_hw(&hw, NULL, hwif);

	hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	if (hwif == NULL)

		goto out;



	i = hwif->index;



	if (hwif->present)

		ide_unregister(i, 0, 1);

	else if (!hwif->hold)

		ide_init_port_data(hwif, i);



	ide_init_port_hw(hwif, &hw);

	hwif->quirkproc = NULL;



	idx[0] = i;



	ide_device_add(idx, NULL);

out:

	return 0;

}

drivers/ide/ide.c

+29 −12
Original line number Diff line number Diff line
@@ -683,6 +683,31 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw) 
}

EXPORT_SYMBOL_GPL(ide_init_port_hw);



ide_hwif_t *ide_deprecated_find_port(unsigned long base)

{

	ide_hwif_t *hwif;

	int i;



	for (i = 0; i < MAX_HWIFS; i++) {

		hwif = &ide_hwifs[i];

		if (hwif->io_ports[IDE_DATA_OFFSET] == base)

			goto found;

	}



	for (i = 0; i < MAX_HWIFS; i++) {

		hwif = &ide_hwifs[i];

		if (hwif->hold)

			continue;

		if (!hwif->present && hwif->mate == NULL)

			goto found;

	}



	hwif = NULL;

found:

	return hwif;

}

EXPORT_SYMBOL_GPL(ide_deprecated_find_port);



/**

 *	ide_register_hw		-	register IDE interface

 *	@hw: hardware registers
@@ -702,18 +727,10 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *), 
	u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };



	do {

		for (index = 0; index < MAX_HWIFS; ++index) {

			hwif = &ide_hwifs[index];

			if (hwif->io_ports[IDE_DATA_OFFSET] == hw->io_ports[IDE_DATA_OFFSET])

		hwif = ide_deprecated_find_port(hw->io_ports[IDE_DATA_OFFSET]);

		index = hwif->index;

		if (hwif)

			goto found;

		}

		for (index = 0; index < MAX_HWIFS; ++index) {

			hwif = &ide_hwifs[index];

			if (hwif->hold)

				continue;

			if (!hwif->present && hwif->mate == NULL)

				goto found;

		}

		for (index = 0; index < MAX_HWIFS; index++)

			ide_unregister(index, 1, 1);

	} while (retry--);

drivers/ide/legacy/ide-cs.c

+24 −1
Original line number Diff line number Diff line
@@ -145,13 +145,36 @@ static void ide_detach(struct pcmcia_device *link) 


static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq, struct pcmcia_device *handle)

{

    ide_hwif_t *hwif;

    hw_regs_t hw;

    int i;

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



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

    ide_init_hwif_ports(&hw, io, ctl, NULL);

    hw.irq = irq;

    hw.chipset = ide_pci;

    hw.dev = &handle->dev;

    return ide_register_hw(&hw, &ide_undecoded_slave, NULL);



    hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);

    if (hwif == NULL)

	return -1;



    i = hwif->index;



    if (hwif->present)

	ide_unregister(i, 0, 1);

    else if (!hwif->hold)

	ide_init_port_data(hwif, i);



    ide_init_port_hw(hwif, &hw);

    hwif->quirkproc = &ide_undecoded_slave;



    idx[0] = i;



    ide_device_add(idx, NULL);



    return hwif->present ? i : -1;

}



/*======================================================================

drivers/ide/pci/delkin_cb.c

+27 −6
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) 
	ide_hwif_t *hwif = NULL;

	ide_drive_t *drive;

	int i, rc;

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



	rc = pci_enable_device(dev);

	if (rc) {
@@ -77,12 +78,27 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) 
	hw.irq = dev->irq;

	hw.chipset = ide_pci;		/* this enables IRQ sharing */



	rc = ide_register_hw(&hw, &ide_undecoded_slave, &hwif);

	if (rc < 0) {

		printk(KERN_ERR "delkin_cb: ide_register_hw failed (%d)\n", rc);

		pci_disable_device(dev);

		return -ENODEV;

	}

	hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	if (hwif == NULL)

		goto out_disable;



	i = hwif->index;



	if (hwif->present)

		ide_unregister(i, 0, 1);

	else if (!hwif->hold)

		ide_init_port_data(hwif, i);



	ide_init_port_hw(hwif, &hw);

	hwif->quirkproc = &ide_undecoded_slave;



	idx[0] = i;



	ide_device_add(idx, NULL);



	if (!hwif->present)

		goto out_disable;



	pci_set_drvdata(dev, hwif);

	hwif->dev = &dev->dev;

	drive = &hwif->drives[0];
@@ -91,6 +107,11 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) 
		drive->unmask   = 1;

	}

	return 0;



out_disable:

	printk(KERN_ERR "delkin_cb: no IDE devices found\n");

	pci_disable_device(dev);

	return -ENODEV;

}



static void

include/linux/ide.h

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ typedef struct hw_regs_s { 
} hw_regs_t;



struct hwif_s * ide_find_port(unsigned long);

struct hwif_s *ide_deprecated_find_port(unsigned long);

void ide_init_port_data(struct hwif_s *, unsigned int);

void ide_init_port_hw(struct hwif_s *, hw_regs_t *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE