Attachment #46282 for bug #104670

View | Details | Raw Unified | Return to bug 104670
Collapse All | Expand All

Lines 803-808 found: Link Here

(-)a/drivers/ide/ide.c (+1 lines)
803	hwif->irq = hw->irq;	803	hwif->irq = hw->irq;
804	hwif->noprobe = 0;	804	hwif->noprobe = 0;
805	hwif->chipset = hw->chipset;	805	hwif->chipset = hw->chipset;
		806	hwif->gendev.parent = hw->dev;
806		807
807	if (!initializing) {	808	if (!initializing) {
808	probe_hwif_init_with_fixup(hwif, fixup);	809	probe_hwif_init_with_fixup(hwif, fixup);




    
} /* ide_detach */

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_std_init_ports(&hw, io, ctl);
    hw.irq = irq;
    hw.chipset = ide_pci;
    hw.dev = &handle->dev;
    return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave);
}



    /* 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, 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, handle);
	    if (hd >= 0) {
		io_base += 0x10;
		ctl_base += 0x10;

Lines 230-235 typedef struct hw_regs_s { Link Here

(-)a/include/linux/ide.h (+1 lines)
230	int dma; /* our dma entry */	230	int dma; /* our dma entry */
231	ide_ack_intr_t ack_intr; / acknowledge interrupt */	231	ide_ack_intr_t ack_intr; / acknowledge interrupt */
232	hwif_chipset_t chipset;	232	hwif_chipset_t chipset;
		233	struct device *dev;
233	} hw_regs_t;	234	} hw_regs_t;
234		235
235	/*	236	/*

Return to bug 104670

Lines 182-194 static void ide_detach(dev_link_t *link) Link Here

(-)a/drivers/ide/legacy/ide-cs.c (-4 / +5 lines)
182		182
183	} /* ide_detach */	183	} /* ide_detach */
184		184
185	static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq)	185	static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq, struct pcmcia_device *handle)
186	{	186	{
187	hw_regs_t hw;	187	hw_regs_t hw;
188	memset(&hw, 0, sizeof(hw));	188	memset(&hw, 0, sizeof(hw));
189	ide_init_hwif_ports(&hw, io, ctl, NULL);	189	ide_std_init_ports(&hw, io, ctl);
190	hw.irq = irq;	190	hw.irq = irq;
191	hw.chipset = ide_pci;	191	hw.chipset = ide_pci;
		192	hw.dev = &handle->dev;
192	return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave);	193	return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave);
193	}	194	}
194		195
Lines 328-339 static void ide_config(dev_link_t *link) Link Here
328		329
329	/* retry registration in case device is still spinning up */	330	/* retry registration in case device is still spinning up */
330	for (hd = -1, i = 0; i < 10; i++) {	331	for (hd = -1, i = 0; i < 10; i++) {
331	hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ);	332	hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, handle);
332	if (hd >= 0) break;	333	if (hd >= 0) break;
333	if (link->io.NumPorts1 == 0x20) {	334	if (link->io.NumPorts1 == 0x20) {
334	outb(0x02, ctl_base + 0x10);	335	outb(0x02, ctl_base + 0x10);
335	hd = idecs_register(io_base + 0x10, ctl_base + 0x10,	336	hd = idecs_register(io_base + 0x10, ctl_base + 0x10,
336	link->irq.AssignedIRQ);	337	link->irq.AssignedIRQ, handle);
337	if (hd >= 0) {	338	if (hd >= 0) {
338	io_base += 0x10;	339	io_base += 0x10;
339	ctl_base += 0x10;	340	ctl_base += 0x10;