Re: [PATCH 2/2] of: reserved_mem: fix 'const' annotation

From: Arnd Bergmann
Date: Thu May 11 2017 - 11:00:42 EST


On Thu, May 11, 2017 at 4:50 PM, Rob Herring <robh+dt@xxxxxxxxxx> wrote:
> On Thu, May 11, 2017 at 7:24 AM, Arnd Bergmann <arnd@xxxxxxxx> wrote:
>> It's the pointer that is supposed to be const, not the return
>> type of the function.
>>
>> drivers/of/of_reserved_mem.c: In function '__reserved_mem_init_node':
>> drivers/of/of_reserved_mem.c:200:7: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
>> int const (*initfn)(struct reserved_mem *rmem) = i->data;
>>
>> Fixes: 17a70355ea57 ("of: fix sparse warnings in fdt, irq, reserved mem, and resolver code")
>> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
>> ---
>> drivers/of/of_reserved_mem.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
>> index 4dec07ea510f..3f03ec004829 100644
>> --- a/drivers/of/of_reserved_mem.c
>> +++ b/drivers/of/of_reserved_mem.c
>> @@ -197,7 +197,7 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem)
>> const struct of_device_id *i;
>>
>> for (i = __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) {
>> - int const (*initfn)(struct reserved_mem *rmem) = i->data;
>> + int (* const initfn)(struct reserved_mem *rmem) = i->data;
>
> Why did you move the const here? That doesn't seem to help with sparse.

I must have misread the sparse warning.

> I think I'll just revert this back to using reservedmem_of_init_fn.

Sounds good, thanks.

Arnd