Re: [PATCH next v2 2/2] PCI: keystone: remove unnecessary goto statement

[Murali Karicheri]

On 04/19/2016 09:06 PM, Bjorn Helgaas wrote:
> Hi Murali,
> 
> On Mon, Apr 11, 2016 at 10:50:31AM -0400, Murali Karicheri wrote:
>> Fix the misuse of goto statement in ks_pcie_get_irq_controller_info()
>> as simple return is more appropriate for this function. While at
>> it add an error log for absence of interrupt controller node.
>>
>> Signed-off-by: Murali Karicheri <m-karicheri2@xxxxxx>
>> Cc: Rob Herring <robh+dt@xxxxxxxxxx>
>> Cc: Pawel Moll <pawel.moll@xxxxxxx>
>> Cc: Mark Rutland <mark.rutland@xxxxxxx>
>> Cc: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx>
>> Cc: Kumar Gala <galak@xxxxxxxxxxxxxx>
>> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>>
>> ---
>>  v2 - removed an unnecessary extra line added in the previous version
>>  v1 - same as before initial version
>>  drivers/pci/host/pci-keystone.c | 9 +++++----
>>  1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
>> index 299f2f0..0234828 100644
>> --- a/drivers/pci/host/pci-keystone.c
>> +++ b/drivers/pci/host/pci-keystone.c
>> @@ -181,11 +181,13 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
>>  	*np_temp = of_find_node_by_name(np_pcie, controller);
>>  	if (!(*np_temp)) {
>>  		dev_err(dev, "Node for %s is absent\n", controller);
>> -		goto out;
>> +		return ret;
>>  	}
>>  	temp = of_irq_count(*np_temp);
>> -	if (!temp)
>> -		goto out;
>> +	if (!temp) {
>> +		dev_err(dev, "No entries in %s\n", controller);
>> +		return ret;
>> +	}
>>  	if (temp > max_host_irqs)
>>  		dev_warn(dev, "Too many %s interrupts defined %u\n",
>>  			(legacy ? "legacy" : "MSI"), temp);
>> @@ -203,7 +205,6 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
>>  		*num_irqs = temp;
>>  		ret = 0;
>>  	}
>> -out:
>>  	return ret;
> 
> I really like these cleanups; thanks for doing them.
> 
> I went a step further because I think we always know the value of
> "ret" at each of these places, so I inserted those and dropped "ret"
> altogether.
> 
> I applied the patch below to pci/host-keystone for v4.7.
Bjorn,

Which repo has your  pci/host-keystone branch?

I did a fetch of the remote pci at git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
and could see only following host branches:-

git branch -r | grep "pci/pci/host-"

pci/pci/host-designware
pci/pci/host-generic
pci/pci/host-imx6
pci/pci/host-iproc
pci/pci/host-mvebu
pci/pci/host-rcar
pci/pci/host-tegra
pci/pci/host-vmd
pci/pci/host-xgene
pci/pci/host-xgene-dd2
pci/pci/host-xilinx-nwl

Thanks and Regards,

Murali

> 
> 
> commit a7ed67a22484f70b8d0c33c76ad7faeac97222a7
> Author: Murali Karicheri <m-karicheri2@xxxxxx>
> Date:   Mon Apr 11 10:50:31 2016 -0400
> 
>     PCI: keystone: Remove unnecessary goto statement
>     
>     Fix the misuse of goto statement in ks_pcie_get_irq_controller_info() as
>     simple return is more appropriate for this function.  While at it add an
>     error log for absence of interrupt controller node.
>     
>     [bhelgaas: drop "ret" altogether since we always know the return value]
>     Signed-off-by: Murali Karicheri <m-karicheri2@xxxxxx>
>     Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>     CC: Rob Herring <robh+dt@xxxxxxxxxx>
>     CC: Pawel Moll <pawel.moll@xxxxxxx>
>     CC: Mark Rutland <mark.rutland@xxxxxxx>
>     CC: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx>
>     CC: Kumar Gala <galak@xxxxxxxxxxxxxx>
> 
> diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
> index 6868918..95a66f77 100644
> --- a/drivers/pci/host/pci-keystone.c
> +++ b/drivers/pci/host/pci-keystone.c
> @@ -160,7 +160,7 @@ static void ks_pcie_legacy_irq_handler(struct irq_desc *desc)
>  static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
>  					   char *controller, int *num_irqs)
>  {
> -	int temp, max_host_irqs, legacy = 1, *host_irqs, ret = -EINVAL;
> +	int temp, max_host_irqs, legacy = 1, *host_irqs;
>  	struct device *dev = ks_pcie->pp.dev;
>  	struct device_node *np_pcie = dev->of_node, **np_temp;
>  
> @@ -181,11 +181,15 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
>  	*np_temp = of_find_node_by_name(np_pcie, controller);
>  	if (!(*np_temp)) {
>  		dev_err(dev, "Node for %s is absent\n", controller);
> -		goto out;
> +		return -EINVAL;
>  	}
> +
>  	temp = of_irq_count(*np_temp);
> -	if (!temp)
> -		goto out;
> +	if (!temp) {
> +		dev_err(dev, "No IRQ entries in %s\n", controller);
> +		return -EINVAL;
> +	}
> +
>  	if (temp > max_host_irqs)
>  		dev_warn(dev, "Too many %s interrupts defined %u\n",
>  			(legacy ? "legacy" : "MSI"), temp);
> @@ -199,12 +203,13 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
>  		if (!host_irqs[temp])
>  			break;
>  	}
> +
>  	if (temp) {
>  		*num_irqs = temp;
> -		ret = 0;
> +		return 0;
>  	}
> -out:
> -	return ret;
> +
> +	return -EINVAL;
>  }
>  
>  static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)
> @@ -345,7 +350,7 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,
>  		return ret;
>  	}
>  
> -	return ret;
> +	return 0;
>  }
>  
>  static const struct of_device_id ks_pcie_of_match[] = {
> @@ -374,7 +379,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
>  	struct resource *res;
>  	void __iomem *reg_p;
>  	struct phy *phy;
> -	int ret = 0;
> +	int ret;
>  
>  	ks_pcie = devm_kzalloc(&pdev->dev, sizeof(*ks_pcie),
>  				GFP_KERNEL);
> 


-- 
Murali Karicheri
Linux Kernel, Keystone