On 12/05/2012 04:08 PM, Sergei Shtylyov wrote:
> Hello.
>
> On 04-12-2012 18:12, Roger Quadros wrote:
>
>> Use devm_ variants of kzalloc() and ioremap(). Simplify the error path.
>
>> Signed-off-by: Roger Quadros <rog...@ti.com>
>> ---
>> drivers/mfd/omap-usb-tll.c | 37 +++++++++++--------------------------
>> 1 files changed, 11 insertions(+), 26 deletions(-)
>
>> diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
>> index e67cafc..828207f 100644
>> --- a/drivers/mfd/omap-usb-tll.c
>> +++ b/drivers/mfd/omap-usb-tll.c
> [...]
>> @@ -230,28 +229,21 @@ static int __devinit usbtll_omap_probe(struct
>> platform_device *pdev)
>> if (IS_ERR(tll->usbtll_p1_fck)) {
>> ret = PTR_ERR(tll->usbtll_p1_fck);
>> dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);
>> - goto err_tll;
>> + return ret;
>> }
>>
>> tll->usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");
>> if (IS_ERR(tll->usbtll_p2_fck)) {
>> ret = PTR_ERR(tll->usbtll_p2_fck);
>> dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);
>> - goto err_usbtll_p1_fck;
>> + goto err_p2_fck;
>> }
>>
>> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> - if (!res) {
>> - dev_err(dev, "usb tll get resource failed\n");
>> - ret = -ENODEV;
>> - goto err_usbtll_p2_fck;
>> - }
>
> Not clear why you removed the error check...
>
It is because devm_request_and_ioremap does it for you.
http://lxr.free-electrons.com/source/lib/devres.c#L88
>> -
>> - base = ioremap(res->start, resource_size(res));
>> + base = devm_request_and_ioremap(dev, res);
>> if (!base) {
>> - dev_err(dev, "TLL ioremap failed\n");
>> - ret = -ENOMEM;
>> - goto err_usbtll_p2_fck;
>> + ret = -EADDRNOTAVAIL;
>
> Why you changed this from ENOMEM?
as per the documentation for devm_request_and_ioremap() in the
same link I sent above.
cheers,
-roger
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
