| Message ID | 20191029174037.25381-4-festevam@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/5] watchdog: imx7ulp: Fix reboot hang | expand |
On Tue, Oct 29, 2019 at 02:40:36PM -0300, Fabio Estevam wrote: > Compiler is smart enough and knows when to inline, so there > is no need to mark some of these functions as 'inline'. > > Remove such annotations. > > Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/imx7ulp_wdt.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c > index ed4f7d439f2e..bcef3b6a9782 100644 > --- a/drivers/watchdog/imx7ulp_wdt.c > +++ b/drivers/watchdog/imx7ulp_wdt.c > @@ -46,7 +46,7 @@ struct imx7ulp_wdt_device { > struct clk *clk; > }; > > -static inline void imx7ulp_wdt_enable(struct watchdog_device *wdog, bool enable) > +static void imx7ulp_wdt_enable(struct watchdog_device *wdog, bool enable) > { > struct imx7ulp_wdt_device *wdt = watchdog_get_drvdata(wdog); > > @@ -59,7 +59,7 @@ static inline void imx7ulp_wdt_enable(struct watchdog_device *wdog, bool enable) > writel(val & ~WDOG_CS_EN, wdt->base + WDOG_CS); > } > > -static inline bool imx7ulp_wdt_is_enabled(void __iomem *base) > +static bool imx7ulp_wdt_is_enabled(void __iomem *base) > { > u32 val = readl(base + WDOG_CS); > > @@ -132,7 +132,7 @@ static const struct watchdog_info imx7ulp_wdt_info = { > WDIOF_MAGICCLOSE, > }; > > -static inline void imx7ulp_wdt_init(void __iomem *base, unsigned int timeout) > +static void imx7ulp_wdt_init(void __iomem *base, unsigned int timeout) > { > u32 val; >
diff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c index ed4f7d439f2e..bcef3b6a9782 100644 --- a/drivers/watchdog/imx7ulp_wdt.c +++ b/drivers/watchdog/imx7ulp_wdt.c @@ -46,7 +46,7 @@ struct imx7ulp_wdt_device { struct clk *clk; }; -static inline void imx7ulp_wdt_enable(struct watchdog_device *wdog, bool enable) +static void imx7ulp_wdt_enable(struct watchdog_device *wdog, bool enable) { struct imx7ulp_wdt_device *wdt = watchdog_get_drvdata(wdog); @@ -59,7 +59,7 @@ static inline void imx7ulp_wdt_enable(struct watchdog_device *wdog, bool enable) writel(val & ~WDOG_CS_EN, wdt->base + WDOG_CS); } -static inline bool imx7ulp_wdt_is_enabled(void __iomem *base) +static bool imx7ulp_wdt_is_enabled(void __iomem *base) { u32 val = readl(base + WDOG_CS); @@ -132,7 +132,7 @@ static const struct watchdog_info imx7ulp_wdt_info = { WDIOF_MAGICCLOSE, }; -static inline void imx7ulp_wdt_init(void __iomem *base, unsigned int timeout) +static void imx7ulp_wdt_init(void __iomem *base, unsigned int timeout) { u32 val;
Compiler is smart enough and knows when to inline, so there is no need to mark some of these functions as 'inline'. Remove such annotations. Signed-off-by: Fabio Estevam <festevam@gmail.com> --- drivers/watchdog/imx7ulp_wdt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)