lkml.org 
[lkml]   [2015]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] PCIe / hotplug: Drop pointless label from pciehp_probe()
On Sat, May 23, 2015 at 12:38:57AM +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> The err_out_none label in pciehp_probe() only leads to a return
> statement, so use return statements instead of jumps to it and
> drop it.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Applied to pci/hotplug for v4.2, thanks!

> ---
>
> On top of https://patchwork.kernel.org/patch/6436921/ .
>
> ---
> drivers/pci/hotplug/pciehp_core.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> Index: linux-pm/drivers/pci/hotplug/pciehp_core.c
> ===================================================================
> --- linux-pm.orig/drivers/pci/hotplug/pciehp_core.c
> +++ linux-pm/drivers/pci/hotplug/pciehp_core.c
> @@ -256,13 +256,13 @@ static int pciehp_probe(struct pcie_devi
> /* Can happen if we run out of bus numbers during probe */
> dev_err(&dev->device,
> "Hotplug bridge without secondary bus, ignoring\n");
> - goto err_out_none;
> + return -ENODEV;
> }
>
> ctrl = pcie_init(dev);
> if (!ctrl) {
> dev_err(&dev->device, "Controller initialization failed\n");
> - goto err_out_none;
> + return -ENODEV;
> }
> set_service_data(dev, ctrl);
>
> @@ -302,7 +302,6 @@ err_out_free_ctrl_slot:
> cleanup_slot(ctrl);
> err_out_release_ctlr:
> pciehp_release_ctrl(ctrl);
> -err_out_none:
> return -ENODEV;
> }
>
>


\
 
 \ /
  Last update: 2015-05-23 01:21    [W:0.034 / U:0.212 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site