On Fri, Apr 24, 2015 at 11:48:33AM +0200, Uwe Kleine-König wrote:
> Instead of using an over-long expression involving the ?: operator use
> an if and intead of an else branch rely on the fact that the data
> structure was allocated using devm_kzalloc. This also allows to put the
> used helper variable into a more local scope.
>
> There is no functional change.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
looks good to me
Reviewed-by: Felipe Balbi <balbi@xxxxxx>
> ---
> drivers/watchdog/omap_wdt.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
> index 479e7c8e44f5..0421c06a6cf0 100644
> --- a/drivers/watchdog/omap_wdt.c
> +++ b/drivers/watchdog/omap_wdt.c
> @@ -209,7 +209,6 @@ static int omap_wdt_probe(struct platform_device *pdev)
> struct omap_wd_timer_platform_data *pdata = dev_get_platdata(&pdev->dev);
> struct resource *res;
> struct omap_wdt_dev *wdev;
> - u32 rs;
> int ret;
>
> wdev = devm_kzalloc(&pdev->dev, sizeof(*wdev), GFP_KERNEL);
> @@ -242,12 +241,11 @@ static int omap_wdt_probe(struct platform_device *pdev)
> pm_runtime_enable(wdev->dev);
> pm_runtime_get_sync(wdev->dev);
>
> - if (pdata && pdata->read_reset_sources)
> - rs = pdata->read_reset_sources();
> - else
> - rs = 0;
> - wdev->wdog.bootstatus = (rs & (1 << OMAP_MPU_WD_RST_SRC_ID_SHIFT)) ?
> - WDIOF_CARDRESET : 0;
> + if (pdata && pdata->read_reset_sources) {
> + u32 rs = pdata->read_reset_sources();
> + if (rs & (1 << OMAP_MPU_WD_RST_SRC_ID_SHIFT))
> + wdev->wdog.bootstatus = WDIOF_CARDRESET;
> + }
>
> omap_wdt_disable(wdev);
>
> --
> 2.1.4
>
--
balbi
Attachment:
signature.asc
Description: Digital signature
