[PATCH 09/26] ARM: OMAP: dmtimer: Get rid of check for mem resource error

Joel Fernandes joelf at ti.com
Wed May 7 14:52:28 PDT 2014


On 05/07/2014 10:24 AM, Tony Lindgren wrote:
> * Joel Fernandes <joelf at ti.com> [140424 14:44]:
>> The subsequent devm_ioremap_resource will catch it and print an error, let it
>> be checked there.
>>
>> Signed-off-by: Joel Fernandes <joelf at ti.com>
>> ---
>>  arch/arm/plat-omap/dmtimer.c |    4 ----
>>  1 file changed, 4 deletions(-)
>>
>> diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
>> index 7e806f9..1fd30fa 100644
>> --- a/arch/arm/plat-omap/dmtimer.c
>> +++ b/arch/arm/plat-omap/dmtimer.c
>> @@ -810,10 +810,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
>>  	}
>>  
>>  	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> -	if (unlikely(!mem)) {
>> -		dev_err(dev, "%s: no memory resource.\n", __func__);
>> -		return -ENODEV;
>> -	}
>>  
>>  	timer = devm_kzalloc(dev, sizeof(struct omap_dm_timer), GFP_KERNEL);
>>  	if (!timer) {
> 
> We still need to return an error here and not try to continue though.

We are returning an error if mem is NULL so the redundant check is
unnecessary:

...
        timer->io_base = devm_ioremap_resource(dev, mem);
        if (IS_ERR(timer->io_base))
                return PTR_ERR(timer->io_base);


thanks,

-Joel




More information about the linux-arm-kernel mailing list