[PATCH] arm: mach-omap2: pm: cleanup !CONFIG_SUSPEND handling

[Kevin Hilman]

Kevin Hilman <khilman at ti.com> writes:

> <aaro.koskinen at nokia.com> writes:
>
>> Hi,
>>
>> Kevin Hilman [khilman at ti.com]:
>>> Aaro Koskinen <aaro.koskinen at nokia.com> writes:
>>>
>>> > Make !CONFIG_SUSPEND init declarations identical on all OMAPs and
>>> > eliminate some ifdefs.
>>> >
>>> > Signed-off-by: Aaro Koskinen <aaro.koskinen at nokia.com>
>>>
>>> I like this solution, but it introduces compiler warnings:
>>>
>>> [...]
>>>
>>> As you likely noticed, removing the const leads to checkpatch warnings:
>>>
>>> WARNING: struct platform_suspend_ops should normally be const
>>>
>>> so the choice is between a checkpatch warning or a bunch of compiler
>>> warnings.
>>>
>>> Alternatively, I just posted a patch[1] to linux-pm propsing to fix this
>>> at the source.  Let's see what happens there.  Merging $SUBJECT patch
>>> will depend on how this is fixed upstream.
>>
>> Sorry, I should have mentioned this when I posted the patch. I was aware of
>> this issue, but I thought this was already fixed in upstream. Check the following
>> commit in linux-next:
>>
>> http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=2f55ac072f5344519348c0c94b3d2f4cca46847b
>>
>> (suspend: constify platform_suspend_ops)
>
> ah, thanks.  somehow I missed that one when looking to see if this was
> already fixed.

OK, now your patch and the one from linux-next are conflicting as they
both touch the platform_suspend_ops in pm*.c.

So for now, I'm gonna drop this one, but it should be rebased/reposted as
soon as 2.6.38-rc1 is out.

Thanks,

Kevin