Re: [PATCH] PCI Hotplug: more CPCI updates

[Prarit Bhargava <prarit@sgi.com>]

Greg KH wrote:
> [PATCH] PCI Hotplug: more CPCI updates

> - Switch to pci_get_slot instead of deprecated pci_find_slot.
> - A bunch of CodingStyle fixes.

> -			}
> +		dev = pci_get_slot(slot->bus, PCI_DEVFN(slot->number, 0));
> +		if (dev) {
> +			if (update_adapter_status(slot->hotplug_slot, 1))
> +				warn("failure to update adapter file");
> +			if (update_latch_status(slot->hotplug_slot, 1))
> +				warn("failure to update latch file");
> +			slot->dev = dev;
>  		}
>  	}

I don't claim to know the code as well as Scott or Greg does, but I don't see a 
pci_put_dev for the slot->dev to clean up the usage count?

> @@ -311,10 +277,10 @@ int cpci_configure_slot(struct slot* slo
>  		 */
>  		n = pci_scan_slot(slot->bus, slot->devfn);
>  		dbg("%s: pci_scan_slot returned %d", __FUNCTION__, n);
> -		if(n > 0)
> +		if (n > 0)
>  			pci_bus_add_devices(slot->bus);
> -		slot->dev = pci_find_slot(slot->bus->number, slot->devfn);
> -		if(slot->dev == NULL) {
> +		slot->dev = pci_get_slot(slot->bus, slot->devfn);
> +		if (slot->dev == NULL) {
>  			err("Could not find PCI device for slot %02x", slot->number);
>  			return 1;
>  		}

Same here -- I don't see a pci_put_dev for the slot->dev.

> @@ -341,15 +305,15 @@ int cpci_unconfigure_slot(struct slot* s
>  	struct pci_dev *dev;
>  
>  	dbg("%s - enter", __FUNCTION__);
> -	if(!slot->dev) {
> +	if (!slot->dev) {
>  		err("No device for slot %02x\n", slot->number);
>  		return -ENODEV;
>  	}
>  
>  	for (i = 0; i < 8; i++) {
> -		dev = pci_find_slot(slot->bus->number,
> +		dev = pci_get_slot(slot->bus,
>  				    PCI_DEVFN(PCI_SLOT(slot->devfn), i));
> -		if(dev) {
> +		if (dev) {
>  			pci_remove_bus_device(dev);
>  			slot->dev = NULL;
>  		}

And again here...

P.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/