* [PATCH -next] omapfb: connector-hdmi: simplify the return expression of hdmic_connect
@ 2020-09-21 13:10 Qinglang Miao
2020-10-16 21:19 ` Sam Ravnborg
0 siblings, 1 reply; 2+ messages in thread
From: Qinglang Miao @ 2020-09-21 13:10 UTC (permalink / raw)
To: Linus Walleij, Bartosz Golaszewski, Bartlomiej Zolnierkiewicz
Cc: linux-gpio, linux-kernel, linux-omap, linux-fbdev, dri-devel,
Qinglang Miao
Simplify the return expression.
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
---
drivers/gpio/gpio-cs5535.c | 6 +-----
drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c | 7 +------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c
index 53b24e3ae..57b9ddffd 100644
--- a/drivers/gpio/gpio-cs5535.c
+++ b/drivers/gpio/gpio-cs5535.c
@@ -345,12 +345,8 @@ static int cs5535_gpio_probe(struct platform_device *pdev)
mask_orig, mask);
/* finally, register with the generic GPIO API */
- err = devm_gpiochip_add_data(&pdev->dev, &cs5535_gpio_chip.chip,
+ return devm_gpiochip_add_data(&pdev->dev, &cs5535_gpio_chip.chip,
&cs5535_gpio_chip);
- if (err)
- return err;
-
- return 0;
}
static struct platform_driver cs5535_gpio_driver = {
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
index 49551afbd..670b9c6eb 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
@@ -50,18 +50,13 @@ static int hdmic_connect(struct omap_dss_device *dssdev)
{
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
- int r;
dev_dbg(ddata->dev, "connect\n");
if (omapdss_device_is_connected(dssdev))
return 0;
- r = in->ops.hdmi->connect(in, dssdev);
- if (r)
- return r;
-
- return 0;
+ return in->ops.hdmi->connect(in, dssdev);
}
static void hdmic_disconnect(struct omap_dss_device *dssdev)
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH -next] omapfb: connector-hdmi: simplify the return expression of hdmic_connect
2020-09-21 13:10 [PATCH -next] omapfb: connector-hdmi: simplify the return expression of hdmic_connect Qinglang Miao
@ 2020-10-16 21:19 ` Sam Ravnborg
0 siblings, 0 replies; 2+ messages in thread
From: Sam Ravnborg @ 2020-10-16 21:19 UTC (permalink / raw)
To: Qinglang Miao
Cc: Linus Walleij, Bartosz Golaszewski, Bartlomiej Zolnierkiewicz,
linux-fbdev, linux-kernel, linux-gpio, dri-devel, linux-omap
Hi Qinglang Miao
On Mon, Sep 21, 2020 at 09:10:51PM +0800, Qinglang Miao wrote:
> Simplify the return expression.
>
> Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
I dropped the changes to gpio-cs5535.c when I applied this patch to
drm-misc-next. It looks like an accident that it was included here.
Sam
> ---
> drivers/gpio/gpio-cs5535.c | 6 +-----
> drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c | 7 +------
> 2 files changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c
> index 53b24e3ae..57b9ddffd 100644
> --- a/drivers/gpio/gpio-cs5535.c
> +++ b/drivers/gpio/gpio-cs5535.c
> @@ -345,12 +345,8 @@ static int cs5535_gpio_probe(struct platform_device *pdev)
> mask_orig, mask);
>
> /* finally, register with the generic GPIO API */
> - err = devm_gpiochip_add_data(&pdev->dev, &cs5535_gpio_chip.chip,
> + return devm_gpiochip_add_data(&pdev->dev, &cs5535_gpio_chip.chip,
> &cs5535_gpio_chip);
> - if (err)
> - return err;
> -
> - return 0;
> }
>
> static struct platform_driver cs5535_gpio_driver = {
> diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
> index 49551afbd..670b9c6eb 100644
> --- a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
> +++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
> @@ -50,18 +50,13 @@ static int hdmic_connect(struct omap_dss_device *dssdev)
> {
> struct panel_drv_data *ddata = to_panel_data(dssdev);
> struct omap_dss_device *in = ddata->in;
> - int r;
>
> dev_dbg(ddata->dev, "connect\n");
>
> if (omapdss_device_is_connected(dssdev))
> return 0;
>
> - r = in->ops.hdmi->connect(in, dssdev);
> - if (r)
> - return r;
> -
> - return 0;
> + return in->ops.hdmi->connect(in, dssdev);
> }
>
> static void hdmic_disconnect(struct omap_dss_device *dssdev)
> --
> 2.23.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-16 21:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-21 13:10 [PATCH -next] omapfb: connector-hdmi: simplify the return expression of hdmic_connect Qinglang Miao
2020-10-16 21:19 ` Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).