On 11/3/2017 1:18 PM, Mark Rutland wrote:
> Hi Chris,
>
> On Fri, Nov 03, 2017 at 01:04:51PM -0400, Chris Metcalf wrote:
>> diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
>> index fd4b7f684bd0..61ea7f907c56 100644
>> --- a/drivers/clocksource/arm_arch_timer.c
>> +++ b/drivers/clocksource/arm_arch_timer.c
>> @@ -722,6 +722,8 @@ static void __arch_timer_setup(unsigned type,
>> }
>> }
>>
>> + clk->set_state_oneshot_stopped = clk->set_state_shutdown;
> AFAICT, we've set up this callback since commit:
>
> cf8c5009ee37d25c ("clockevents/drivers/arm_arch_timer: Implement ->set_state_oneshot_stopped()")
>
> ... so I don't beleive this is necessary, and I think this change can be
> dropped.
Thanks, I will drop it. I missed the semantic merge conflict there.
I extracted the arch/tile specific part of the change and just pushed it
through
the tile tree.
--
Chris Metcalf, Mellanox Technologies
http://www.mellanox.com
From 1583066210440197055@xxx Fri Nov 03 17:19:46 +0000 2017
X-GM-THRID: 1583065470946398635
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread