diff mbox series

power: supply: sbs-manager: Remove class argument from i2c_mux_add_adapter()

Message ID 20240513201400.16589-2-wsa+renesas@sang-engineering.com
State Accepted
Headers show
Series power: supply: sbs-manager: Remove class argument from i2c_mux_add_adapter() | expand

Commit Message

Wolfram Sang May 13, 2024, 8:11 p.m. UTC
Commit 99a741aa7a2d ("i2c: mux: gpio: remove support for class-based
device instantiation") removed the last call to i2c_mux_add_adapter()
with a non-null class argument. Therefore the class argument can be
removed.

Note: Class-based device instantiation is a legacy mechanism which
shouldn't be used in new code, so we can rule out that this argument
may be needed again in the future.

This driver was forgotten by the patch in the Fixes tag.

Fixes: fec1982d7072 ("i2c: mux: Remove class argument from i2c_mux_add_adapter()")
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

The to-be-fixed patch is only in linux-next in my i2c/for-next tree. We
want to remove this unneeded parameter in the next mergewindow. I
suggest that I just put it on top of my branch to avoid the
dependencies. A quick ack would be super-awesome! Thanks.

 drivers/power/supply/sbs-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sebastian Reichel May 13, 2024, 9:17 p.m. UTC | #1
Hi Wolfram,

On Mon, May 13, 2024 at 10:11:16PM +0200, Wolfram Sang wrote:
> Commit 99a741aa7a2d ("i2c: mux: gpio: remove support for class-based
> device instantiation") removed the last call to i2c_mux_add_adapter()
> with a non-null class argument. Therefore the class argument can be
> removed.
> 
> Note: Class-based device instantiation is a legacy mechanism which
> shouldn't be used in new code, so we can rule out that this argument
> may be needed again in the future.
> 
> This driver was forgotten by the patch in the Fixes tag.
> 
> Fixes: fec1982d7072 ("i2c: mux: Remove class argument from i2c_mux_add_adapter()")
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
> 
> The to-be-fixed patch is only in linux-next in my i2c/for-next tree. We
> want to remove this unneeded parameter in the next mergewindow. I
> suggest that I just put it on top of my branch to avoid the
> dependencies. A quick ack would be super-awesome! Thanks.

Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- Sebastian

>  drivers/power/supply/sbs-manager.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/power/supply/sbs-manager.c b/drivers/power/supply/sbs-manager.c
> index 9e4141cffbf9..933b04806d10 100644
> --- a/drivers/power/supply/sbs-manager.c
> +++ b/drivers/power/supply/sbs-manager.c
> @@ -358,7 +358,7 @@ static int sbsm_probe(struct i2c_client *client)
>  	/* register muxed i2c channels. One for each supported battery */
>  	for (i = 0; i < SBSM_MAX_BATS; ++i) {
>  		if (data->supported_bats & BIT(i)) {
> -			ret = i2c_mux_add_adapter(data->muxc, 0, i + 1, 0);
> +			ret = i2c_mux_add_adapter(data->muxc, 0, i + 1);
>  			if (ret)
>  				break;
>  		}
> -- 
> 2.43.0
>
Wolfram Sang May 14, 2024, 7:23 a.m. UTC | #2
> > The to-be-fixed patch is only in linux-next in my i2c/for-next tree. We
> > want to remove this unneeded parameter in the next mergewindow. I
> > suggest that I just put it on top of my branch to avoid the
> > dependencies. A quick ack would be super-awesome! Thanks.
> 
> Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Awesome, thanks a ton!
diff mbox series

Patch

diff --git a/drivers/power/supply/sbs-manager.c b/drivers/power/supply/sbs-manager.c
index 9e4141cffbf9..933b04806d10 100644
--- a/drivers/power/supply/sbs-manager.c
+++ b/drivers/power/supply/sbs-manager.c
@@ -358,7 +358,7 @@  static int sbsm_probe(struct i2c_client *client)
 	/* register muxed i2c channels. One for each supported battery */
 	for (i = 0; i < SBSM_MAX_BATS; ++i) {
 		if (data->supported_bats & BIT(i)) {
-			ret = i2c_mux_add_adapter(data->muxc, 0, i + 1, 0);
+			ret = i2c_mux_add_adapter(data->muxc, 0, i + 1);
 			if (ret)
 				break;
 		}