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

Commit 4349d5cd authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Bartlomiej Zolnierkiewicz
Browse files

[PATCH] ide: incorrect device link for ide-cs 



Devices driven by ide-cs will appear under /sys/devices instead of the
appropriate PCMCIA device. To fix this I had to extend the hw_regs_t
structure with a 'struct device' field, which allows us to set the
parent link for the appropriate hwif.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@suse.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent a5ee3634

drivers/ide/ide.c

+1 −0
Original line number Diff line number Diff line
@@ -803,6 +803,7 @@ int ide_register_hw_with_fixup(hw_regs_t *hw, ide_hwif_t **hwifp, void(*fixup)(i 
	hwif->irq = hw->irq;

	hwif->noprobe = 0;

	hwif->chipset = hw->chipset;

	hwif->gendev.parent = hw->dev;



	if (!initializing) {

		probe_hwif_init_with_fixup(hwif, fixup);

drivers/ide/legacy/ide-cs.c

+4 −3
Original line number Diff line number Diff line
@@ -182,13 +182,14 @@ static void ide_detach(dev_link_t *link) 
    

} /* ide_detach */



static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq)

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

{

    hw_regs_t hw;

    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_with_fixup(&hw, NULL, ide_undecoded_slave);

}
@@ -327,12 +328,12 @@ static void ide_config(dev_link_t *link) 


    /* retry registration in case device is still spinning up */

    for (hd = -1, i = 0; i < 10; i++) {

	hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ);

	hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, handle);

	if (hd >= 0) break;

	if (link->io.NumPorts1 == 0x20) {

	    outb(0x02, ctl_base + 0x10);

	    hd = idecs_register(io_base + 0x10, ctl_base + 0x10,

				link->irq.AssignedIRQ);

				link->irq.AssignedIRQ, handle);

	    if (hd >= 0) {

		io_base += 0x10;

		ctl_base += 0x10;

include/linux/ide.h

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ typedef struct hw_regs_s { 
	int		dma;			/* our dma entry */

	ide_ack_intr_t	*ack_intr;		/* acknowledge interrupt */

	hwif_chipset_t  chipset;

	struct device	*dev;

} hw_regs_t;



/*