diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-31 07:11:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-31 07:11:45 +0200 |
| commit | 5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2 (patch) | |
| tree | 777c39ad4586149de154be3c4c102f751336a37b /drivers/clocksource/timer-cadence-ttc.c | |
| parent | 3ed8e1c2ac9914a2fcb08ec13476b85319536cea (diff) | |
| parent | f75aef392f869018f78cfedf3c320a6b3fcfda6b (diff) | |
| download | linux-stable-5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2.tar.gz linux-stable-5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2.tar.bz2 linux-stable-5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2.zip | |
Merge 5.9-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clocksource/timer-cadence-ttc.c')
| -rw-r--r-- | drivers/clocksource/timer-cadence-ttc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c index 38858e141731..80e960602030 100644 --- a/drivers/clocksource/timer-cadence-ttc.c +++ b/drivers/clocksource/timer-cadence-ttc.c @@ -309,7 +309,7 @@ static int ttc_rate_change_clocksource_cb(struct notifier_block *nb, /* restore original register value */ writel_relaxed(ttccs->scale_clk_ctrl_reg_old, ttccs->ttc.base_addr + TTC_CLK_CNTRL_OFFSET); - /* fall through */ + fallthrough; default: return NOTIFY_DONE; } @@ -392,7 +392,7 @@ static int ttc_rate_change_clockevent_cb(struct notifier_block *nb, clockevents_update_freq(&ttcce->ce, ndata->new_rate / PRESCALE); - /* fall through */ + fallthrough; case PRE_RATE_CHANGE: case ABORT_RATE_CHANGE: default: |