The following commit has been merged into the timers/core branch of tip: Commit-ID: 8c0d9461ab760439b09ae321803ee85df1136e08 Gitweb: https://git.kernel.org/tip/8c0d9461ab760439b09ae321803ee85df1136e08 Author: Dan Carpenter <dan.carpenter@xxxxxxxxxx> AuthorDate: Thu, 19 May 2022 16:58:23 +03:00 Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> CommitterDate: Tue, 24 May 2022 09:16:29 +02:00 clocksource/drivers/timer-ti-dm: Remove unnecessary NULL check The "pdata" pointer cannot be NULL because it's checked at the start of the function. Delete the check. Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Link: https://lore.kernel.org/r/YoZM65RFDQAfqV6J@kili Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> --- drivers/clocksource/timer-ti-dm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index 3e52c52..33609be 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -828,8 +828,7 @@ static int omap_dm_timer_probe(struct platform_device *pdev) cpu_pm_register_notifier(&timer->nb); } - if (pdata) - timer->errata = pdata->timer_errata; + timer->errata = pdata->timer_errata; timer->pdev = pdev;
|