Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756022AbeAHIoY (ORCPT + 1 other); Mon, 8 Jan 2018 03:44:24 -0500 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:15771 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755990AbeAHIoW (ORCPT ); Mon, 8 Jan 2018 03:44:22 -0500 X-IronPort-AV: E=Sophos;i="5.46,330,1511852400"; d="scan'208";a="9993745" Subject: Re: [PATCH v6 08/10] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops To: Keerthy , , , , CC: , , , , , , , , References: <1514887799-24605-1-git-send-email-j-keerthy@ti.com> <1514887799-24605-9-git-send-email-j-keerthy@ti.com> From: Claudiu Beznea Message-ID: Date: Mon, 8 Jan 2018 10:44:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <1514887799-24605-9-git-send-email-j-keerthy@ti.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On 02.01.2018 12:09, Keerthy wrote: > Adapt driver to utilize dmtimer pdata ops instead of pdata-quirks. > > Signed-off-by: Keerthy > Tested-by: Ladislav Michl > --- > drivers/pwm/pwm-omap-dmtimer.c | 39 ++++++++++++++++++++++----------------- > 1 file changed, 22 insertions(+), 17 deletions(-) > > diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c > index 5ad42f3..3b27aff 100644 > --- a/drivers/pwm/pwm-omap-dmtimer.c > +++ b/drivers/pwm/pwm-omap-dmtimer.c > @@ -23,6 +23,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -37,7 +38,7 @@ struct pwm_omap_dmtimer_chip { > struct pwm_chip chip; > struct mutex mutex; > pwm_omap_dmtimer *dm_timer; > - struct pwm_omap_dmtimer_pdata *pdata; > + struct omap_dm_timer_ops *pdata; > struct platform_device *dm_timer_pdev; > }; > > @@ -242,19 +243,33 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev) > { > struct device_node *np = pdev->dev.of_node; > struct device_node *timer; > + struct platform_device *timer_pdev; > struct pwm_omap_dmtimer_chip *omap; > - struct pwm_omap_dmtimer_pdata *pdata; > + struct dmtimer_platform_data *timer_pdata; > + struct omap_dm_timer_ops *pdata; > pwm_omap_dmtimer *dm_timer; > u32 v; > int status; > > - pdata = dev_get_platdata(&pdev->dev); > - if (!pdata) { > - dev_err(&pdev->dev, "Missing dmtimer platform data\n"); > + timer = of_parse_phandle(np, "ti,timers", 0); of_node_put() should be called when done with device_node pointer returned by of_parse_phandle() (you may want to check the return ERROR cases below regarding this statement): > + if (!timer) > + return -ENODEV; > + > + timer_pdev = of_find_device_by_node(timer); > + if (!timer_pdev) { > + dev_err(&pdev->dev, "Unable to find Timer pdev\n"); here > + return -ENODEV; > + } > + > + timer_pdata = dev_get_platdata(&timer_pdev->dev); > + if (!timer_pdata) { > + dev_err(&pdev->dev, "dmtimer pdata structure NULL\n"); here > return -EINVAL; > } > > - if (!pdata->request_by_node || > + pdata = timer_pdata->timer_ops; > + > + if (!pdata || !pdata->request_by_node || > !pdata->free || > !pdata->enable || > !pdata->disable || > @@ -270,10 +285,6 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev) > return -EINVAL; > } > > - timer = of_parse_phandle(np, "ti,timers", 0); > - if (!timer) > - return -ENODEV; > - > if (!of_get_property(timer, "ti,timer-pwm", NULL)) { here > dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n"); > return -ENODEV; > @@ -291,13 +302,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev) > > omap->pdata = pdata; > omap->dm_timer = dm_timer; > - > - omap->dm_timer_pdev = of_find_device_by_node(timer); > - if (!omap->dm_timer_pdev) { > - dev_err(&pdev->dev, "Unable to find timer pdev\n"); > - omap->pdata->free(dm_timer); > - return -EINVAL; > - } > + omap->dm_timer_pdev = timer_pdev; > > /* > * Ensure that the timer is stopped before we allow PWM core to call > And all the other return instructions from probe function not listed by git diff