Re: [PATCH 14/16] PCI slot: Change return value ofpci_destroy_slot() (Not for mainline!)

[Alex Chiang]

* Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>:
> Since nobody checks the return value from pci_destroy_slot(), it
> should be void.

Thanks, merged.

/ac

> 
> Signed-off-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
> 
> ---
>  drivers/pci/slot.c  |    4 +---
>  include/linux/pci.h |    2 +-
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> Index: linux-2.6.25-rc6/drivers/pci/slot.c
> ===================================================================
> --- linux-2.6.25-rc6.orig/drivers/pci/slot.c
> +++ linux-2.6.25-rc6/drivers/pci/slot.c
> @@ -118,7 +118,7 @@ struct pci_slot *pci_create_slot(struct 
>  }
>  EXPORT_SYMBOL_GPL(pci_create_slot);
>  
> -int pci_destroy_slot(struct pci_slot *slot)
> +void pci_destroy_slot(struct pci_slot *slot)
>  {
>  	pr_debug("%s: decreased refcount to %d on %x:%d\n", __func__,
>  		 atomic_read(&slot->kobj.kref.refcount) - 1, slot->bus->number,
> @@ -127,8 +127,6 @@ int pci_destroy_slot(struct pci_slot *sl
>  	down_write(&pci_bus_sem);
>  	kobject_put(&slot->kobj);
>  	up_write(&pci_bus_sem);
> -
> -	return 0;
>  }
>  EXPORT_SYMBOL_GPL(pci_destroy_slot);
>  
> Index: linux-2.6.25-rc6/include/linux/pci.h
> ===================================================================
> --- linux-2.6.25-rc6.orig/include/linux/pci.h
> +++ linux-2.6.25-rc6/include/linux/pci.h
> @@ -493,7 +493,7 @@ struct pci_bus *pci_add_new_bus(struct p
>  				int busnr);
>  struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,
>  				 const char *name);
> -int pci_destroy_slot(struct pci_slot *slot);
> +void pci_destroy_slot(struct pci_slot *slot);
>  int pci_scan_slot(struct pci_bus *bus, int devfn);
>  struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn);
>  void pci_device_add(struct pci_dev *dev, struct pci_bus *bus);
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/