Re: [PATCH 15/16] PCI slot: Trivial cleanups for slot.c (Not for mainline!)

Alex Chiang
2008-03-25T03:31:36Z

* Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>:
> Some trivial cleanups for drivers/pci/slot.c.

Thanks, merged.

/ac

>
> Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
>
> ---
> drivers/pci/slot.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 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
> @@ -132,19 +132,16 @@ EXPORT_SYMBOL_GPL(pci_destroy_slot);
>
> static int pci_slot_init(void)
> {
> - int result = 0;
> struct kset *pci_bus_kset;
>
> pci_bus_kset = bus_get_kset(&pci_bus_type);
> -
> pci_slots_kset = kset_create_and_add("slots", NULL,
> &pci_bus_kset->kobj);
> if (!pci_slots_kset) {
> - result = -ENOMEM;
> - printk(KERN_ERR "PCI: Slot initialization failure (%d)\n",
> - result);
> + printk(KERN_ERR "PCI: Slot initialization failure\n");
> + return -ENOMEM;
> }
> - return result;
> + return 0;
> }
>
> subsys_initcall(pci_slot_init);
>
>