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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

Thanks, merged.

/ac

> 
> Signed-off-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
> 
> ---
>  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);
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux IBM ACPI]     [Linux Power Management]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux