[PATCH] i2c: reorganize muxes to a standard pattern

[PATCH] i2c: reorganize muxes to a standard pattern

[Wolfram Sang]

Analog to ca632f5 (spi: reorganize drivers), introduce a standard pattern
for naming the muxes. This is done for the rest of the I2C subsystem already, so
we stay in sync with that.

Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---

Only build tested.

 drivers/i2c/muxes/Kconfig                          |    9 ---------
 drivers/i2c/muxes/Makefile                         |    6 +++---
 .../i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c}    |    0
 drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} |    0
 drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} |    0
 5 files changed, 3 insertions(+), 12 deletions(-)
 rename drivers/i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c} (100%)
 rename drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} (100%)
 rename drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} (100%)

diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 90b7a01..a112d9d 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -14,9 +14,6 @@ config I2C_MUX_GPIO
 	  I2C busses connected through a MUX, which is controlled
 	  through GPIO pins.
 
-	  This driver can also be built as a module.  If so, the module
-	  will be called gpio-i2cmux.
-
 config I2C_MUX_PCA9541
 	tristate "NXP PCA9541 I2C Master Selector"
 	depends on EXPERIMENTAL
@@ -24,9 +21,6 @@ config I2C_MUX_PCA9541
 	  If you say yes here you get support for the NXP PCA9541
 	  I2C Master Selector.
 
-	  This driver can also be built as a module.  If so, the module
-	  will be called pca9541.
-
 config I2C_MUX_PCA954x
 	tristate "Philips PCA954x I2C Mux/switches"
 	depends on EXPERIMENTAL
@@ -34,7 +28,4 @@ config I2C_MUX_PCA954x
 	  If you say yes here you get support for the Philips PCA954x
 	  I2C mux/switch devices.
 
-	  This driver can also be built as a module.  If so, the module
-	  will be called pca954x.
-
 endmenu
diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
index 4640436..5826249 100644
--- a/drivers/i2c/muxes/Makefile
+++ b/drivers/i2c/muxes/Makefile
@@ -1,8 +1,8 @@
 #
 # Makefile for multiplexer I2C chip drivers.
 
-obj-$(CONFIG_I2C_MUX_GPIO)	+= gpio-i2cmux.o
-obj-$(CONFIG_I2C_MUX_PCA9541)	+= pca9541.o
-obj-$(CONFIG_I2C_MUX_PCA954x)	+= pca954x.o
+obj-$(CONFIG_I2C_MUX_GPIO)	+= i2c-mux-gpio.o
+obj-$(CONFIG_I2C_MUX_PCA9541)	+= i2c-mux-pca9541.o
+obj-$(CONFIG_I2C_MUX_PCA954x)	+= i2c-mux-pca954x.o
 
 ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
diff --git a/drivers/i2c/muxes/gpio-i2cmux.c b/drivers/i2c/muxes/i2c-mux-gpio.c
similarity index 100%
rename from drivers/i2c/muxes/gpio-i2cmux.c
rename to drivers/i2c/muxes/i2c-mux-gpio.c
diff --git a/drivers/i2c/muxes/pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
similarity index 100%
rename from drivers/i2c/muxes/pca9541.c
rename to drivers/i2c/muxes/i2c-mux-pca9541.c
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
similarity index 100%
rename from drivers/i2c/muxes/pca954x.c
rename to drivers/i2c/muxes/i2c-mux-pca954x.c
-- 
1.7.2.5

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 3503 bytes --]

On Sun, Nov 13, 2011 at 10:41:14PM +0100, Wolfram Sang wrote:
> Analog to ca632f5 (spi: reorganize drivers), introduce a standard pattern
> for naming the muxes. This is done for the rest of the I2C subsystem already, so
> we stay in sync with that.
> 
> Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> ---

Ping.

> 
> Only build tested.
> 
>  drivers/i2c/muxes/Kconfig                          |    9 ---------
>  drivers/i2c/muxes/Makefile                         |    6 +++---
>  .../i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c}    |    0
>  drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} |    0
>  drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} |    0
>  5 files changed, 3 insertions(+), 12 deletions(-)
>  rename drivers/i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c} (100%)
>  rename drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} (100%)
>  rename drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} (100%)
> 
> diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
> index 90b7a01..a112d9d 100644
> --- a/drivers/i2c/muxes/Kconfig
> +++ b/drivers/i2c/muxes/Kconfig
> @@ -14,9 +14,6 @@ config I2C_MUX_GPIO
>  	  I2C busses connected through a MUX, which is controlled
>  	  through GPIO pins.
>  
> -	  This driver can also be built as a module.  If so, the module
> -	  will be called gpio-i2cmux.
> -
>  config I2C_MUX_PCA9541
>  	tristate "NXP PCA9541 I2C Master Selector"
>  	depends on EXPERIMENTAL
> @@ -24,9 +21,6 @@ config I2C_MUX_PCA9541
>  	  If you say yes here you get support for the NXP PCA9541
>  	  I2C Master Selector.
>  
> -	  This driver can also be built as a module.  If so, the module
> -	  will be called pca9541.
> -
>  config I2C_MUX_PCA954x
>  	tristate "Philips PCA954x I2C Mux/switches"
>  	depends on EXPERIMENTAL
> @@ -34,7 +28,4 @@ config I2C_MUX_PCA954x
>  	  If you say yes here you get support for the Philips PCA954x
>  	  I2C mux/switch devices.
>  
> -	  This driver can also be built as a module.  If so, the module
> -	  will be called pca954x.
> -
>  endmenu
> diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
> index 4640436..5826249 100644
> --- a/drivers/i2c/muxes/Makefile
> +++ b/drivers/i2c/muxes/Makefile
> @@ -1,8 +1,8 @@
>  #
>  # Makefile for multiplexer I2C chip drivers.
>  
> -obj-$(CONFIG_I2C_MUX_GPIO)	+= gpio-i2cmux.o
> -obj-$(CONFIG_I2C_MUX_PCA9541)	+= pca9541.o
> -obj-$(CONFIG_I2C_MUX_PCA954x)	+= pca954x.o
> +obj-$(CONFIG_I2C_MUX_GPIO)	+= i2c-mux-gpio.o
> +obj-$(CONFIG_I2C_MUX_PCA9541)	+= i2c-mux-pca9541.o
> +obj-$(CONFIG_I2C_MUX_PCA954x)	+= i2c-mux-pca954x.o
>  
>  ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
> diff --git a/drivers/i2c/muxes/gpio-i2cmux.c b/drivers/i2c/muxes/i2c-mux-gpio.c
> similarity index 100%
> rename from drivers/i2c/muxes/gpio-i2cmux.c
> rename to drivers/i2c/muxes/i2c-mux-gpio.c
> diff --git a/drivers/i2c/muxes/pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
> similarity index 100%
> rename from drivers/i2c/muxes/pca9541.c
> rename to drivers/i2c/muxes/i2c-mux-pca9541.c
> diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
> similarity index 100%
> rename from drivers/i2c/muxes/pca954x.c
> rename to drivers/i2c/muxes/i2c-mux-pca954x.c
> -- 
> 1.7.2.5
> 

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Jean Delvare]

Hi Wolfram,

Sorry for the late reply.

On Sun, 13 Nov 2011 22:41:14 +0100, Wolfram Sang wrote:
> Analog to ca632f5 (spi: reorganize drivers), introduce a standard pattern
> for naming the muxes. This is done for the rest of the I2C subsystem already, so
> we stay in sync with that.
> 
> Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> ---
> 
> Only build tested.
> 
>  drivers/i2c/muxes/Kconfig                          |    9 ---------
>  drivers/i2c/muxes/Makefile                         |    6 +++---
>  .../i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c}    |    0
>  drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} |    0
>  drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} |    0
>  5 files changed, 3 insertions(+), 12 deletions(-)
>  rename drivers/i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c} (100%)
>  rename drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} (100%)
>  rename drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} (100%)

You forgot to rename Documentation/i2c/muxes/gpio-i2cmux.

I thought the naming had been discussed before, but I can't find the
references, and to be honest the new names please me, so I have no
reason to decline your proposal. I would have appreciated an ack from
the driver authors (Cc'd) though. I'll apply your patch as soon as I
receive an updated version, unless I get an objection before then.

> 
> diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
> index 90b7a01..a112d9d 100644
> --- a/drivers/i2c/muxes/Kconfig
> +++ b/drivers/i2c/muxes/Kconfig
> @@ -14,9 +14,6 @@ config I2C_MUX_GPIO
>  	  I2C busses connected through a MUX, which is controlled
>  	  through GPIO pins.
>  
> -	  This driver can also be built as a module.  If so, the module
> -	  will be called gpio-i2cmux.
> -
>  config I2C_MUX_PCA9541
>  	tristate "NXP PCA9541 I2C Master Selector"
>  	depends on EXPERIMENTAL
> @@ -24,9 +21,6 @@ config I2C_MUX_PCA9541
>  	  If you say yes here you get support for the NXP PCA9541
>  	  I2C Master Selector.
>  
> -	  This driver can also be built as a module.  If so, the module
> -	  will be called pca9541.
> -
>  config I2C_MUX_PCA954x
>  	tristate "Philips PCA954x I2C Mux/switches"
>  	depends on EXPERIMENTAL
> @@ -34,7 +28,4 @@ config I2C_MUX_PCA954x
>  	  If you say yes here you get support for the Philips PCA954x
>  	  I2C mux/switch devices.
>  
> -	  This driver can also be built as a module.  If so, the module
> -	  will be called pca954x.
> -
>  endmenu
> diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
> index 4640436..5826249 100644
> --- a/drivers/i2c/muxes/Makefile
> +++ b/drivers/i2c/muxes/Makefile
> @@ -1,8 +1,8 @@
>  #
>  # Makefile for multiplexer I2C chip drivers.
>  
> -obj-$(CONFIG_I2C_MUX_GPIO)	+= gpio-i2cmux.o
> -obj-$(CONFIG_I2C_MUX_PCA9541)	+= pca9541.o
> -obj-$(CONFIG_I2C_MUX_PCA954x)	+= pca954x.o
> +obj-$(CONFIG_I2C_MUX_GPIO)	+= i2c-mux-gpio.o
> +obj-$(CONFIG_I2C_MUX_PCA9541)	+= i2c-mux-pca9541.o
> +obj-$(CONFIG_I2C_MUX_PCA954x)	+= i2c-mux-pca954x.o
>  
>  ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
> diff --git a/drivers/i2c/muxes/gpio-i2cmux.c b/drivers/i2c/muxes/i2c-mux-gpio.c
> similarity index 100%
> rename from drivers/i2c/muxes/gpio-i2cmux.c
> rename to drivers/i2c/muxes/i2c-mux-gpio.c
> diff --git a/drivers/i2c/muxes/pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
> similarity index 100%
> rename from drivers/i2c/muxes/pca9541.c
> rename to drivers/i2c/muxes/i2c-mux-pca9541.c
> diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
> similarity index 100%
> rename from drivers/i2c/muxes/pca954x.c
> rename to drivers/i2c/muxes/i2c-mux-pca954x.c


-- 
Jean Delvare

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Peter Korsgaard]

>>>>> "Jean" == Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> writes:

Hi,

 >> rename drivers/i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c} (100%)
 >> rename drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} (100%)
 >> rename drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} (100%)

 Jean> You forgot to rename Documentation/i2c/muxes/gpio-i2cmux.

 Jean> I thought the naming had been discussed before, but I can't find the
 Jean> references, and to be honest the new names please me, so I have no
 Jean> reason to decline your proposal. I would have appreciated an ack from
 Jean> the driver authors (Cc'd) though. I'll apply your patch as soon as I
 Jean> receive an updated version, unless I get an objection before then.

Are you referring to this?

http://thread.gmane.org/gmane.linux.drivers.i2c/7171/focus=7244

I originally called it i2c-gpiomux.c, and renamed it to gpio-i2cmux.c on
request of you.

I don't mind the new name though, so:

Acked-by: Peter Korsgaard <peter.korsgaard-ob4gmnvZ1/cAvxtiuMwx3w@public.gmane.org>

-- 
Bye, Peter Korsgaard

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Jean Delvare]

On Sun, 27 Nov 2011 22:15:12 +0100, Peter Korsgaard wrote:
> >>>>> "Jean" == Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> writes:
> 
> Hi,
> 
>  >> rename drivers/i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c} (100%)
>  >> rename drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} (100%)
>  >> rename drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} (100%)
> 
>  Jean> You forgot to rename Documentation/i2c/muxes/gpio-i2cmux.
> 
>  Jean> I thought the naming had been discussed before, but I can't find the
>  Jean> references, and to be honest the new names please me, so I have no
>  Jean> reason to decline your proposal. I would have appreciated an ack from
>  Jean> the driver authors (Cc'd) though. I'll apply your patch as soon as I
>  Jean> receive an updated version, unless I get an objection before then.
> 
> Are you referring to this?
> 
> http://thread.gmane.org/gmane.linux.drivers.i2c/7171/focus=7244

Ah, yes, that's the discussion I was looking for, thanks for digging it
out. My point wasn't totally wrong back then, but Wolfram's is simply
better, I admit.

> I originally called it i2c-gpiomux.c, and renamed it to gpio-i2cmux.c on
> request of you.
> 
> I don't mind the new name though, so:
> 
> Acked-by: Peter Korsgaard <peter.korsgaard-ob4gmnvZ1/cAvxtiuMwx3w@public.gmane.org>

Thanks,
-- 
Jean Delvare

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]


> > http://thread.gmane.org/gmane.linux.drivers.i2c/7171/focus=7244
> 
> Ah, yes, that's the discussion I was looking for, thanks for digging it
> out. My point wasn't totally wrong back then, but Wolfram's is simply
> better, I admit.

I agree :) Okay, so I'll update the documentation as well. What about
include/linux/gpio-i2cmux.h and its users? I'd like consistency, but
renaming header files is not too nice...

Thanks,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Peter Korsgaard]

>>>>> "Wolfram" == Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> writes:

 >> > http://thread.gmane.org/gmane.linux.drivers.i2c/7171/focus=7244
 >> 
 >> Ah, yes, that's the discussion I was looking for, thanks for digging it
 >> out. My point wasn't totally wrong back then, but Wolfram's is simply
 >> better, I admit.

 Wolfram> I agree :) Okay, so I'll update the documentation as well. What about
 Wolfram> include/linux/gpio-i2cmux.h and its users? I'd like consistency, but
 Wolfram> renaming header files is not too nice...

Indeed. If we were to rename it we should also rename struct
gpio_i2cmux_platform_data.

I don't feel strongly about it - It will break for existing users, but
there's probably not too many of those. Your call.

-- 
Bye, Peter Korsgaard

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Jean Delvare]

On Mon, 28 Nov 2011 10:58:30 +0100, Peter Korsgaard wrote:
> >>>>> "Wolfram" == Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> writes:
> 
>  >> > http://thread.gmane.org/gmane.linux.drivers.i2c/7171/focus=7244
>  >> 
>  >> Ah, yes, that's the discussion I was looking for, thanks for digging it
>  >> out. My point wasn't totally wrong back then, but Wolfram's is simply
>  >> better, I admit.
> 
>  Wolfram> I agree :) Okay, so I'll update the documentation as well. What about
>  Wolfram> include/linux/gpio-i2cmux.h and its users? I'd like consistency, but
>  Wolfram> renaming header files is not too nice...
> 
> Indeed. If we were to rename it we should also rename struct
> gpio_i2cmux_platform_data.
> 
> I don't feel strongly about it - It will break for existing users, but
> there's probably not too many of those. Your call.

I see exactly 1 user of <linux/gpio-i2cmux.h> in the upstream kernel
tree, and that is gpio-i2cmux itself. So I'd say no big deal renaming
it, and actually if we intend to rename header files and/or structures,
the sooner the better.

-- 
Jean Delvare

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Jean Delvare]

On Mon, 28 Nov 2011 12:57:51 +0100, Jean Delvare wrote:
> On Mon, 28 Nov 2011 10:58:30 +0100, Peter Korsgaard wrote:
> > >>>>> "Wolfram" == Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> writes:
> > 
> >  >> > http://thread.gmane.org/gmane.linux.drivers.i2c/7171/focus=7244
> >  >> 
> >  >> Ah, yes, that's the discussion I was looking for, thanks for digging it
> >  >> out. My point wasn't totally wrong back then, but Wolfram's is simply
> >  >> better, I admit.
> > 
> >  Wolfram> I agree :) Okay, so I'll update the documentation as well. What about
> >  Wolfram> include/linux/gpio-i2cmux.h and its users? I'd like consistency, but
> >  Wolfram> renaming header files is not too nice...
> > 
> > Indeed. If we were to rename it we should also rename struct
> > gpio_i2cmux_platform_data.
> > 
> > I don't feel strongly about it - It will break for existing users, but
> > there's probably not too many of those. Your call.
> 
> I see exactly 1 user of <linux/gpio-i2cmux.h> in the upstream kernel
> tree, and that is gpio-i2cmux itself. So I'd say no big deal renaming
> it, and actually if we intend to rename header files and/or structures,
> the sooner the better.

Wolfram, Peter, any progress here? I think Wolfram was supposed to send
an updated patch but I did not receive anything.

-- 
Jean Delvare

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 1665 bytes --]

On Sat, Jan 07, 2012 at 03:38:20PM +0100, Jean Delvare wrote:
> On Mon, 28 Nov 2011 12:57:51 +0100, Jean Delvare wrote:
> > On Mon, 28 Nov 2011 10:58:30 +0100, Peter Korsgaard wrote:
> > > >>>>> "Wolfram" == Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> writes:
> > > 
> > >  >> > http://thread.gmane.org/gmane.linux.drivers.i2c/7171/focus=7244
> > >  >> 
> > >  >> Ah, yes, that's the discussion I was looking for, thanks for digging it
> > >  >> out. My point wasn't totally wrong back then, but Wolfram's is simply
> > >  >> better, I admit.
> > > 
> > >  Wolfram> I agree :) Okay, so I'll update the documentation as well. What about
> > >  Wolfram> include/linux/gpio-i2cmux.h and its users? I'd like consistency, but
> > >  Wolfram> renaming header files is not too nice...
> > > 
> > > Indeed. If we were to rename it we should also rename struct
> > > gpio_i2cmux_platform_data.
> > > 
> > > I don't feel strongly about it - It will break for existing users, but
> > > there's probably not too many of those. Your call.
> > 
> > I see exactly 1 user of <linux/gpio-i2cmux.h> in the upstream kernel
> > tree, and that is gpio-i2cmux itself. So I'd say no big deal renaming
> > it, and actually if we intend to rename header files and/or structures,
> > the sooner the better.
> 
> Wolfram, Peter, any progress here? I think Wolfram was supposed to send
> an updated patch but I did not receive anything.

-EBUSY :(

It *is* on my todo-list, though...

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Jean Delvare]

On Sat, 7 Jan 2012 15:46:00 +0100, Wolfram Sang wrote:
> On Sat, Jan 07, 2012 at 03:38:20PM +0100, Jean Delvare wrote:
> > On Mon, 28 Nov 2011 12:57:51 +0100, Jean Delvare wrote:
> > > I see exactly 1 user of <linux/gpio-i2cmux.h> in the upstream kernel
> > > tree, and that is gpio-i2cmux itself. So I'd say no big deal renaming
> > > it, and actually if we intend to rename header files and/or structures,
> > > the sooner the better.
> > 
> > Wolfram, Peter, any progress here? I think Wolfram was supposed to send
> > an updated patch but I did not receive anything.
> 
> -EBUSY :(
> 
> It *is* on my todo-list, though...

OK, no problem. Let's schedule this for kernel 3.4 then.

-- 
Jean Delvare

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Jean Delvare]

On Sat, 7 Jan 2012 15:46:00 +0100, Wolfram Sang wrote:
> On Sat, Jan 07, 2012 at 03:38:20PM +0100, Jean Delvare wrote:
> > On Mon, 28 Nov 2011 12:57:51 +0100, Jean Delvare wrote:
> > > On Mon, 28 Nov 2011 10:58:30 +0100, Peter Korsgaard wrote:
> > > > Indeed. If we were to rename it we should also rename struct
> > > > gpio_i2cmux_platform_data.
> > > > 
> > > > I don't feel strongly about it - It will break for existing users, but
> > > > there's probably not too many of those. Your call.
> > > 
> > > I see exactly 1 user of <linux/gpio-i2cmux.h> in the upstream kernel
> > > tree, and that is gpio-i2cmux itself. So I'd say no big deal renaming
> > > it, and actually if we intend to rename header files and/or structures,
> > > the sooner the better.
> > 
> > Wolfram, Peter, any progress here? I think Wolfram was supposed to send
> > an updated patch but I did not receive anything.
> 
> -EBUSY :(
> 
> It *is* on my todo-list, though...

Any news on this?

-- 
Jean Delvare

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

> > > Wolfram, Peter, any progress here? I think Wolfram was supposed to send
> > > an updated patch but I did not receive anything.
> > 
> > -EBUSY :(
> > 
> > It *is* on my todo-list, though...
> 
> Any news on this?

Well, it is still on my list :/ (I wouldn't mind if someone is faster than me)

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Peter Korsgaard]

>>>>> "Wolfram" == Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> writes:

 >> > > Wolfram, Peter, any progress here? I think Wolfram was supposed to send
 >> > > an updated patch but I did not receive anything.
 >> > 
 >> > -EBUSY :(
 >> > 
 >> > It *is* on my todo-list, though...
 >> 
 >> Any news on this?

 Wolfram> Well, it is still on my list :/ (I wouldn't mind if someone is
 Wolfram> faster than me)

I'll be away for the next 2 weeks, but will do it afterwards if nobody
beats me to it (and I don't forget).

-- 
Bye, Peter Korsgaard

Re: [PATCH] i2c: reorganize muxes to a standard pattern

[Guenter Roeck]

On Sun, Nov 27, 2011 at 03:48:47PM -0500, Jean Delvare wrote:
> Hi Wolfram,
> 
> Sorry for the late reply.
> 
> On Sun, 13 Nov 2011 22:41:14 +0100, Wolfram Sang wrote:
> > Analog to ca632f5 (spi: reorganize drivers), introduce a standard pattern
> > for naming the muxes. This is done for the rest of the I2C subsystem already, so
> > we stay in sync with that.
> > 
> > Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> > ---
> > 
> > Only build tested.
> > 
> >  drivers/i2c/muxes/Kconfig                          |    9 ---------
> >  drivers/i2c/muxes/Makefile                         |    6 +++---
> >  .../i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c}    |    0
> >  drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} |    0
> >  drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} |    0
> >  5 files changed, 3 insertions(+), 12 deletions(-)
> >  rename drivers/i2c/muxes/{gpio-i2cmux.c => i2c-mux-gpio.c} (100%)
> >  rename drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} (100%)
> >  rename drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} (100%)
> 
> You forgot to rename Documentation/i2c/muxes/gpio-i2cmux.
> 
> I thought the naming had been discussed before, but I can't find the
> references, and to be honest the new names please me, so I have no
> reason to decline your proposal. I would have appreciated an ack from
> the driver authors (Cc'd) though. I'll apply your patch as soon as I
> receive an updated version, unless I get an objection before then.
> 

For pca9541.c:

Acked-by: Guenter Roeck <guenter.roeck-IzeFyvvaP7pWk0Htik3J/w@public.gmane.org>

> > 
> > diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
> > index 90b7a01..a112d9d 100644
> > --- a/drivers/i2c/muxes/Kconfig
> > +++ b/drivers/i2c/muxes/Kconfig
> > @@ -14,9 +14,6 @@ config I2C_MUX_GPIO
> >  	  I2C busses connected through a MUX, which is controlled
> >  	  through GPIO pins.
> >  
> > -	  This driver can also be built as a module.  If so, the module
> > -	  will be called gpio-i2cmux.
> > -
> >  config I2C_MUX_PCA9541
> >  	tristate "NXP PCA9541 I2C Master Selector"
> >  	depends on EXPERIMENTAL
> > @@ -24,9 +21,6 @@ config I2C_MUX_PCA9541
> >  	  If you say yes here you get support for the NXP PCA9541
> >  	  I2C Master Selector.
> >  
> > -	  This driver can also be built as a module.  If so, the module
> > -	  will be called pca9541.
> > -
> >  config I2C_MUX_PCA954x
> >  	tristate "Philips PCA954x I2C Mux/switches"
> >  	depends on EXPERIMENTAL
> > @@ -34,7 +28,4 @@ config I2C_MUX_PCA954x
> >  	  If you say yes here you get support for the Philips PCA954x
> >  	  I2C mux/switch devices.
> >  
> > -	  This driver can also be built as a module.  If so, the module
> > -	  will be called pca954x.
> > -
> >  endmenu
> > diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
> > index 4640436..5826249 100644
> > --- a/drivers/i2c/muxes/Makefile
> > +++ b/drivers/i2c/muxes/Makefile
> > @@ -1,8 +1,8 @@
> >  #
> >  # Makefile for multiplexer I2C chip drivers.
> >  
> > -obj-$(CONFIG_I2C_MUX_GPIO)	+= gpio-i2cmux.o
> > -obj-$(CONFIG_I2C_MUX_PCA9541)	+= pca9541.o
> > -obj-$(CONFIG_I2C_MUX_PCA954x)	+= pca954x.o
> > +obj-$(CONFIG_I2C_MUX_GPIO)	+= i2c-mux-gpio.o
> > +obj-$(CONFIG_I2C_MUX_PCA9541)	+= i2c-mux-pca9541.o
> > +obj-$(CONFIG_I2C_MUX_PCA954x)	+= i2c-mux-pca954x.o
> >  
> >  ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
> > diff --git a/drivers/i2c/muxes/gpio-i2cmux.c b/drivers/i2c/muxes/i2c-mux-gpio.c
> > similarity index 100%
> > rename from drivers/i2c/muxes/gpio-i2cmux.c
> > rename to drivers/i2c/muxes/i2c-mux-gpio.c
> > diff --git a/drivers/i2c/muxes/pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
> > similarity index 100%
> > rename from drivers/i2c/muxes/pca9541.c
> > rename to drivers/i2c/muxes/i2c-mux-pca9541.c
> > diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
> > similarity index 100%
> > rename from drivers/i2c/muxes/pca954x.c
> > rename to drivers/i2c/muxes/i2c-mux-pca954x.c
> 
> 
> -- 
> Jean Delvare