From: Serge Semin <fancer.lancer@gmail.com>
To: Peter Korsgaard <peter.korsgaard@barco.com>,
Peter Rosin <peda@axentia.se>
Cc: Serge Semin <Sergey.Semin@t-platforms.ru>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] i2c-mux-gpio: Return an error if no config data found
Date: Wed, 24 Apr 2019 15:34:11 +0300 [thread overview]
Message-ID: <20190424123414.25311-3-fancer.lancer@gmail.com> (raw)
In-Reply-To: <20190424123414.25311-1-fancer.lancer@gmail.com>
It's pointless and might be even errors prone to proceed with further
initialization if neither of- no platform-based settings were discovered.
Just return an error in this case.
Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
drivers/i2c/muxes/i2c-mux-gpio.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 24cf6ec02e75..a14fe132b0c3 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -132,7 +132,7 @@ static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
static int i2c_mux_gpio_probe_dt(struct gpiomux *mux,
struct platform_device *pdev)
{
- return 0;
+ return -EINVAL;
}
#endif
@@ -142,6 +142,9 @@ static int i2c_mux_gpio_probe_plat(struct gpiomux *mux,
struct i2c_mux_gpio_platform_data *data = dev_get_platdata(&pdev->dev);
struct gpio_chip *gpio;
+ if (!data)
+ return -EINVAL;
+
/*
* If a GPIO chip name is provided, the GPIO pin numbers provided are
* relative to its base GPIO number. Otherwise they are absolute.
@@ -175,11 +178,10 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev)
if (!mux)
return -ENOMEM;
- if (!dev_get_platdata(&pdev->dev))
+ ret = i2c_mux_gpio_probe_plat(mux, pdev);
+ if (ret)
ret = i2c_mux_gpio_probe_dt(mux, pdev);
- else
- ret = i2c_mux_gpio_probe_plat(mux, pdev);
- if (ret < 0)
+ if (ret)
return ret;
parent = i2c_get_adapter(mux->data.parent);
--
2.21.0
next prev parent reply other threads:[~2019-04-24 12:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-24 12:34 [PATCH 0/5] i2c-mux-gpio: Split plat- and dt-specific code up Serge Semin
2019-04-24 12:34 ` [PATCH 1/5] i2c-mux-gpio: Unpin a platform-based device initialization Serge Semin
2019-04-24 12:34 ` Serge Semin [this message]
2019-04-24 21:25 ` [PATCH 2/5] i2c-mux-gpio: Return an error if no config data found Peter Rosin
2019-04-25 15:47 ` Serge Semin
2019-04-25 19:28 ` Peter Rosin
2019-04-25 20:09 ` Serge Semin
2019-04-24 12:34 ` [PATCH 3/5] i2c-mux-gpio: Save initial channel number to the idle data field Serge Semin
2019-04-24 21:26 ` Peter Rosin
2019-04-25 15:53 ` Serge Semin
2019-04-25 19:32 ` Peter Rosin
2019-04-24 12:34 ` [PATCH 4/5] i2c-mux-gpio: Unpin the platform-specific GPIOs request code Serge Semin
2019-04-24 12:34 ` [PATCH 5/5] i2c-mux-gpio: Create of-based GPIOs request method Serge Semin
2019-04-24 21:27 ` Peter Rosin
2019-04-24 21:25 ` [PATCH 0/5] i2c-mux-gpio: Split plat- and dt-specific code up Peter Rosin
2019-04-25 14:37 ` Serge Semin
2019-04-25 19:21 ` Peter Rosin
2019-04-25 20:03 ` Serge Semin
2019-04-25 23:20 ` [PATCH v2 0/3] " Serge Semin
2019-04-25 23:20 ` [PATCH v2 1/3] i2c-mux-gpio: Unpin a platform-based device initialization Serge Semin
2019-06-09 20:51 ` Peter Rosin
2019-04-25 23:20 ` [PATCH v2 2/3] i2c-mux-gpio: Unpin the platform-specific GPIOs request code Serge Semin
2019-06-09 21:34 ` Peter Rosin
2019-06-14 16:31 ` Serge Semin
2019-06-14 18:04 ` Peter Rosin
2019-06-14 21:58 ` Serge Semin
2019-04-25 23:20 ` [PATCH v2 3/3] i2c-mux-gpio: Create of-based GPIOs request method Serge Semin
2019-05-07 9:02 ` [PATCH v2 0/3] i2c-mux-gpio: Split plat- and dt-specific code up Serge Semin
2019-05-07 9:17 ` Peter Rosin
2019-05-07 9:46 ` Serge Semin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190424123414.25311-3-fancer.lancer@gmail.com \
--to=fancer.lancer@gmail.com \
--cc=Sergey.Semin@t-platforms.ru \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peda@axentia.se \
--cc=peter.korsgaard@barco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).