* [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment
@ 2021-03-30 19:33 Andy Shevchenko
2021-03-30 19:33 ` [PATCH v2 2/3] mux: gpio: Make it OF independent Andy Shevchenko
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Andy Shevchenko @ 2021-03-30 19:33 UTC (permalink / raw)
To: Andy Shevchenko, linux-kernel; +Cc: Peter Rosin, Greg Kroah-Hartman
Assigning bitmaps like it's done in the driver might be error prone.
Fix this by using bitmap API.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Peter Rosin <peda@axentia.se>
---
v2: left blank line untouched (Peter)
drivers/mux/gpio.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/mux/gpio.c b/drivers/mux/gpio.c
index 02c1f2c014e8..d1b4aa923657 100644
--- a/drivers/mux/gpio.c
+++ b/drivers/mux/gpio.c
@@ -7,6 +7,7 @@
* Author: Peter Rosin <peda@axentia.se>
*/
+#include <linux/bitmap.h>
#include <linux/err.h>
#include <linux/gpio/consumer.h>
#include <linux/module.h>
@@ -23,8 +24,9 @@ static int mux_gpio_set(struct mux_control *mux, int state)
{
struct mux_gpio *mux_gpio = mux_chip_priv(mux->chip);
DECLARE_BITMAP(values, BITS_PER_TYPE(state));
+ u32 value = state;
- values[0] = state;
+ bitmap_from_arr32(values, &value, BITS_PER_TYPE(value));
gpiod_set_array_value_cansleep(mux_gpio->gpios->ndescs,
mux_gpio->gpios->desc,
@@ -71,7 +73,7 @@ static int mux_gpio_probe(struct platform_device *pdev)
return ret;
}
WARN_ON(pins != mux_gpio->gpios->ndescs);
- mux_chip->mux->states = 1 << pins;
+ mux_chip->mux->states = BIT(pins);
ret = device_property_read_u32(dev, "idle-state", (u32 *)&idle_state);
if (ret >= 0 && idle_state != MUX_IDLE_AS_IS) {
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/3] mux: gpio: Make it OF independent
2021-03-30 19:33 [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment Andy Shevchenko
@ 2021-03-30 19:33 ` Andy Shevchenko
2021-03-30 19:33 ` [PATCH v2 3/3] mux: gpio: Simplify code by using dev_err_probe() Andy Shevchenko
2021-03-31 7:12 ` [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment Peter Rosin
2 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2021-03-30 19:33 UTC (permalink / raw)
To: Andy Shevchenko, linux-kernel; +Cc: Peter Rosin, Greg Kroah-Hartman
Module doesn't use OF APIs anyhow, make it OF independent by replacing
headers and dropping useless of_match_ptr() call.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Peter Rosin <peda@axentia.se>
---
v2: moved mod_devicetable before module (Peter)
drivers/mux/gpio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mux/gpio.c b/drivers/mux/gpio.c
index d1b4aa923657..92cc476c916e 100644
--- a/drivers/mux/gpio.c
+++ b/drivers/mux/gpio.c
@@ -10,9 +10,9 @@
#include <linux/bitmap.h>
#include <linux/err.h>
#include <linux/gpio/consumer.h>
+#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/mux/driver.h>
-#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/property.h>
@@ -98,7 +98,7 @@ static int mux_gpio_probe(struct platform_device *pdev)
static struct platform_driver mux_gpio_driver = {
.driver = {
.name = "gpio-mux",
- .of_match_table = of_match_ptr(mux_gpio_dt_ids),
+ .of_match_table = mux_gpio_dt_ids,
},
.probe = mux_gpio_probe,
};
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 3/3] mux: gpio: Simplify code by using dev_err_probe()
2021-03-30 19:33 [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment Andy Shevchenko
2021-03-30 19:33 ` [PATCH v2 2/3] mux: gpio: Make it OF independent Andy Shevchenko
@ 2021-03-30 19:33 ` Andy Shevchenko
2021-03-31 7:12 ` [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment Peter Rosin
2 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2021-03-30 19:33 UTC (permalink / raw)
To: Andy Shevchenko, linux-kernel; +Cc: Peter Rosin, Greg Kroah-Hartman
Use already prepared dev_err_probe() introduced by the commit
a787e5400a1c ("driver core: add device probe log helper").
It simplifies EPROBE_DEFER handling.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Peter Rosin <peda@axentia.se>
---
v2: wrapped to 80 characters (Peter)
drivers/mux/gpio.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/mux/gpio.c b/drivers/mux/gpio.c
index 92cc476c916e..cc5f2c1861d4 100644
--- a/drivers/mux/gpio.c
+++ b/drivers/mux/gpio.c
@@ -66,12 +66,9 @@ static int mux_gpio_probe(struct platform_device *pdev)
mux_chip->ops = &mux_gpio_ops;
mux_gpio->gpios = devm_gpiod_get_array(dev, "mux", GPIOD_OUT_LOW);
- if (IS_ERR(mux_gpio->gpios)) {
- ret = PTR_ERR(mux_gpio->gpios);
- if (ret != -EPROBE_DEFER)
- dev_err(dev, "failed to get gpios\n");
- return ret;
- }
+ if (IS_ERR(mux_gpio->gpios))
+ return dev_err_probe(dev, PTR_ERR(mux_gpio->gpios),
+ "failed to get gpios\n");
WARN_ON(pins != mux_gpio->gpios->ndescs);
mux_chip->mux->states = BIT(pins);
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment
2021-03-30 19:33 [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment Andy Shevchenko
2021-03-30 19:33 ` [PATCH v2 2/3] mux: gpio: Make it OF independent Andy Shevchenko
2021-03-30 19:33 ` [PATCH v2 3/3] mux: gpio: Simplify code by using dev_err_probe() Andy Shevchenko
@ 2021-03-31 7:12 ` Peter Rosin
2021-04-02 14:29 ` Greg Kroah-Hartman
2 siblings, 1 reply; 5+ messages in thread
From: Peter Rosin @ 2021-03-31 7:12 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Andy Shevchenko, linux-kernel
Hi Greg,
You can pick this series directly, right? I don't feel a compelling need to
add the patches to -next before you take them since they are simple enough...
And drivers/mux is otherwise quiet, as usual.
Cheers,
Peter
On 2021-03-30 21:33, Andy Shevchenko wrote:
> Assigning bitmaps like it's done in the driver might be error prone.
> Fix this by using bitmap API.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Acked-by: Peter Rosin <peda@axentia.se>
> ---
> v2: left blank line untouched (Peter)
> drivers/mux/gpio.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mux/gpio.c b/drivers/mux/gpio.c
> index 02c1f2c014e8..d1b4aa923657 100644
> --- a/drivers/mux/gpio.c
> +++ b/drivers/mux/gpio.c
> @@ -7,6 +7,7 @@
> * Author: Peter Rosin <peda@axentia.se>
> */
>
> +#include <linux/bitmap.h>
> #include <linux/err.h>
> #include <linux/gpio/consumer.h>
> #include <linux/module.h>
> @@ -23,8 +24,9 @@ static int mux_gpio_set(struct mux_control *mux, int state)
> {
> struct mux_gpio *mux_gpio = mux_chip_priv(mux->chip);
> DECLARE_BITMAP(values, BITS_PER_TYPE(state));
> + u32 value = state;
>
> - values[0] = state;
> + bitmap_from_arr32(values, &value, BITS_PER_TYPE(value));
>
> gpiod_set_array_value_cansleep(mux_gpio->gpios->ndescs,
> mux_gpio->gpios->desc,
> @@ -71,7 +73,7 @@ static int mux_gpio_probe(struct platform_device *pdev)
> return ret;
> }
> WARN_ON(pins != mux_gpio->gpios->ndescs);
> - mux_chip->mux->states = 1 << pins;
> + mux_chip->mux->states = BIT(pins);
>
> ret = device_property_read_u32(dev, "idle-state", (u32 *)&idle_state);
> if (ret >= 0 && idle_state != MUX_IDLE_AS_IS) {
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment
2021-03-31 7:12 ` [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment Peter Rosin
@ 2021-04-02 14:29 ` Greg Kroah-Hartman
0 siblings, 0 replies; 5+ messages in thread
From: Greg Kroah-Hartman @ 2021-04-02 14:29 UTC (permalink / raw)
To: Peter Rosin; +Cc: Andy Shevchenko, linux-kernel
On Wed, Mar 31, 2021 at 09:12:45AM +0200, Peter Rosin wrote:
> Hi Greg,
>
> You can pick this series directly, right? I don't feel a compelling need to
> add the patches to -next before you take them since they are simple enough...
All now sucked in, thanks.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-02 14:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-30 19:33 [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment Andy Shevchenko
2021-03-30 19:33 ` [PATCH v2 2/3] mux: gpio: Make it OF independent Andy Shevchenko
2021-03-30 19:33 ` [PATCH v2 3/3] mux: gpio: Simplify code by using dev_err_probe() Andy Shevchenko
2021-03-31 7:12 ` [PATCH v2 1/3] mux: gpio: Use bitmap API instead of direct assignment Peter Rosin
2021-04-02 14:29 ` Greg Kroah-Hartman
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).