[PATCH] mtd: nand: pxa3xx_nand: write exactly one message on probe failure

[Marek Vasut]

On 10/28/2016 10:04 AM, Boris Brezillon wrote:
> On Mon, 19 Sep 2016 11:21:18 +0200
> Uwe Kleine-König <u.kleine-koenig at pengutronix.de> wrote:
> 
>> For some error paths alloc_nand_resource() emitted an error message, for
>> others it didn't. Make it consistently print a message including the
>> error code where it's not constant and drop the hardly helpful
>> additional message printed by the caller of alloc_nand_resource.
>>
>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> 
> It looks good to me. Ezequiel, Robert, any objection to this patch? If
> not, can I have your Acked/Reviewed-by ?
> 
>> ---
>>  drivers/mtd/nand/pxa3xx_nand.c | 17 ++++++++++-------
>>  1 file changed, 10 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
>> index 436dd6dc11f4..052e9725cf12 100644
>> --- a/drivers/mtd/nand/pxa3xx_nand.c
>> +++ b/drivers/mtd/nand/pxa3xx_nand.c
>> @@ -1774,8 +1774,11 @@ static int alloc_nand_resource(struct platform_device *pdev)
>>  	int ret, irq, cs;
>>  
>>  	pdata = dev_get_platdata(&pdev->dev);
>> -	if (pdata->num_cs <= 0)
>> +	if (pdata->num_cs <= 0) {
>> +		dev_err(&pdev->dev, "broken number of chip selects\n");

Not: Should be "invalid number of chip selects" . Also, if you turn the
num_cs to unsigned type in the platdata, the test can be if (foo == 0)
instead.

>>  		return -ENODEV;
>> +	}
>> +
>>  	info = devm_kzalloc(&pdev->dev,
>>  			    sizeof(*info) + sizeof(*host) * pdata->num_cs,
>>  			    GFP_KERNEL);
>> @@ -1814,8 +1817,9 @@ static int alloc_nand_resource(struct platform_device *pdev)
>>  	init_waitqueue_head(&chip->controller->wq);
>>  	info->clk = devm_clk_get(&pdev->dev, NULL);
>>  	if (IS_ERR(info->clk)) {
>> -		dev_err(&pdev->dev, "failed to get nand clock\n");
>> -		return PTR_ERR(info->clk);
>> +		ret = PTR_ERR(info->clk);
>> +		dev_err(&pdev->dev, "failed to get nand clock (%d)\n", ret);
>> +		return ret;
>>  	}
>>  	ret = clk_prepare_enable(info->clk);
>>  	if (ret < 0)
>> @@ -1843,6 +1847,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
>>  	info->mmio_base = devm_ioremap_resource(&pdev->dev, r);
>>  	if (IS_ERR(info->mmio_base)) {
>>  		ret = PTR_ERR(info->mmio_base);
>> +		dev_err(&pdev->dev, "failed to map register space (%d)\n", ret);
>>  		goto fail_disable_clk;
>>  	}
>>  	info->mmio_phys = r->start;
>> @@ -1862,7 +1867,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
>>  				   pxa3xx_nand_irq_thread, IRQF_ONESHOT,
>>  				   pdev->name, info);
>>  	if (ret < 0) {
>> -		dev_err(&pdev->dev, "failed to request IRQ\n");
>> +		dev_err(&pdev->dev, "failed to request IRQ (%d)\n", ret);
>>  		goto fail_free_buf;
>>  	}
>>  
>> @@ -1961,10 +1966,8 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
>>  	}
>>  
>>  	ret = alloc_nand_resource(pdev);
>> -	if (ret) {
>> -		dev_err(&pdev->dev, "alloc nand resource failed\n");
>> +	if (ret)
>>  		return ret;
>> -	}
>>  
>>  	info = platform_get_drvdata(pdev);
>>  	probe_success = 0;
> 
> 
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
> 


-- 
Best regards,
Marek Vasut