2019-08-01 18:56:13

by Frieder Schrempf

Subject: [PATCH v2 2/3] serial: sh-sci: Remove check for specific mctrl_gpio_init() return value

From: Frieder Schrempf <[email protected]>

Now that the mctrl_gpio code returns NULL instead of ERR_PTR(-ENOSYS)
in cases when CONFIG_GPIOLIB is disabled, we can safely remove this
check.

Signed-off-by: Frieder Schrempf <[email protected]>
---
drivers/tty/serial/sh-sci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index d18c680aa64b..249325b65ee0 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -3287,7 +3287,7 @@ static int sci_probe_single(struct platform_device *dev,
return ret;

sciport->gpios = mctrl_gpio_init(&sciport->port, 0);
- if (IS_ERR(sciport->gpios) && PTR_ERR(sciport->gpios) != -ENOSYS)
+ if (IS_ERR(sciport->gpios))
return PTR_ERR(sciport->gpios);

if (sciport->has_rtscts) {
--
2.17.1

2019-08-01 20:40:18

by Uwe Kleine-König

Subject: Re: [PATCH v2 2/3] serial: sh-sci: Remove check for specific mctrl_gpio_init() return value

On Thu, Aug 01, 2019 at 06:45:24PM +0000, Schrempf Frieder wrote:
> From: Frieder Schrempf <[email protected]>
>
> Now that the mctrl_gpio code returns NULL instead of ERR_PTR(-ENOSYS)
> in cases when CONFIG_GPIOLIB is disabled, we can safely remove this
> check.

I would mention -ENOSYS in the Subject line. Something like:

serial: sh-sci: don't check for mctrl_gpio_init returning -ENOSYS

Now that the mctrl_gpio code returns NULL instead of
ERR_PTR(-ENOSYS) if CONFIG_GPIOLIB is disabled, we can safely
remove this check.

Thanks
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |

2019-08-02 09:33:42

by Frieder Schrempf

Subject: Re: [PATCH v2 2/3] serial: sh-sci: Remove check for specific mctrl_gpio_init() return value

On 01.08.19 22:39, Uwe Kleine-König wrote:
> On Thu, Aug 01, 2019 at 06:45:24PM +0000, Schrempf Frieder wrote:
>> From: Frieder Schrempf <[email protected]>
>>
>> Now that the mctrl_gpio code returns NULL instead of ERR_PTR(-ENOSYS)
>> in cases when CONFIG_GPIOLIB is disabled, we can safely remove this
>> check.
>
> I would mention -ENOSYS in the Subject line. Something like:
>
> serial: sh-sci: don't check for mctrl_gpio_init returning -ENOSYS
>
> Now that the mctrl_gpio code returns NULL instead of
> ERR_PTR(-ENOSYS) if CONFIG_GPIOLIB is disabled, we can safely
> remove this check.

Indeed, I failed to come up with a better subject line. I will adopt
your proposal.

> Thanks
> Uwe
>