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

Commit 652aa162 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] IDE: more pci_find cleanup 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a4bea10e

drivers/ide/pci/cs5530.c

+8 −5
Original line number Diff line number Diff line
@@ -222,23 +222,23 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch 
	unsigned long flags;



	dev = NULL;

	while ((dev = pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_ANY_ID, dev)) != NULL) {

	while ((dev = pci_get_device(PCI_VENDOR_ID_CYRIX, PCI_ANY_ID, dev)) != NULL) {

		switch (dev->device) {

			case PCI_DEVICE_ID_CYRIX_PCI_MASTER:

				master_0 = dev;

				master_0 = pci_dev_get(dev);

				break;

			case PCI_DEVICE_ID_CYRIX_5530_LEGACY:

				cs5530_0 = dev;

				cs5530_0 = pci_dev_get(dev);

				break;

		}

	}

	if (!master_0) {

		printk(KERN_ERR "%s: unable to locate PCI MASTER function\n", name);

		return 0;

		goto out;

	}

	if (!cs5530_0) {

		printk(KERN_ERR "%s: unable to locate CS5530 LEGACY function\n", name);

		return 0;

		goto out;

	}



	spin_lock_irqsave(&ide_lock, flags);
@@ -296,6 +296,9 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch 


	spin_unlock_irqrestore(&ide_lock, flags);



out:

	pci_dev_put(master_0);

	pci_dev_put(cs5530_0);

	return 0;

}

drivers/ide/pci/cy82c693.c

+3 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void cy82c693_tune_drive (ide_drive_t *drive, u8 pio) 


	/* select primary or secondary channel */

	if (hwif->index > 0) {  /* drive is on the secondary channel */

		dev = pci_find_slot(dev->bus->number, dev->devfn+1);

		dev = pci_get_slot(dev->bus, dev->devfn+1);

		if (!dev) {

			printk(KERN_ERR "%s: tune_drive: "

				"Cannot find secondary interface!\n",
@@ -500,8 +500,9 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev 
	   Function 1 is primary IDE channel, function 2 - secondary. */

        if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE &&

	    PCI_FUNC(dev->devfn) == 1) {

		dev2 = pci_find_slot(dev->bus->number, dev->devfn + 1);

		dev2 = pci_get_slot(dev->bus, dev->devfn + 1);

		ret = ide_setup_pci_devices(dev, dev2, d);

		/* We leak pci refs here but thats ok - we can't be unloaded */

	}

	return ret;

}

drivers/ide/pci/via82cxxx.c

+4 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static struct via_isa_bridge *via_config_find(struct pci_dev **isa) 
	u8 t;



	for (via_config = via_isa_bridges; via_config->id; via_config++)

		if ((*isa = pci_find_device(PCI_VENDOR_ID_VIA +

		if ((*isa = pci_get_device(PCI_VENDOR_ID_VIA +

			!!(via_config->flags & VIA_BAD_ID),

			via_config->id, NULL))) {
@@ -256,6 +256,7 @@ static struct via_isa_bridge *via_config_find(struct pci_dev **isa) 
			if (t >= via_config->rev_min &&

			    t <= via_config->rev_max)

				break;

			pci_dev_put(*isa);

		}



	return via_config;
@@ -283,6 +284,7 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const 
	via_config = via_config_find(&isa);

	if (!via_config->id) {

		printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n");

		pci_dev_put(isa);

		return -ENODEV;

	}
@@ -361,6 +363,7 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const 
		via_dma[via_config->flags & VIA_UDMA],

		pci_name(dev));



	pci_dev_put(isa);

	return 0;

}