Re: [PATCH 2.6.24-rc5-mm 3/3] gpiolib: obsolete drivers/i2c/chips/pca9539.c

["eric miao" <eric.y.miao@gmail.com>]

On Dec 19, 2007 5:01 PM, Jean Delvare <khali@linux-fr.org> wrote:
> Hi Eric,
>
>
> On Wed, 19 Dec 2007 16:45:00 +0800, eric miao wrote:
> > Updated as follows, the driver name is left unchanged, while
> > Kconfig and Documentation are modified so that
> > 1. mark it as deprecated
> > 2. exclusive selection of SENSOR_PCA9539 and GPIO_PCA9539
> >
> > From c58dc1119355dc94d80763aef9d9bc999abda6df Mon Sep 17 00:00:00 2001
> > From: eric miao <eric.miao@marvell.com>
> > Date: Wed, 19 Dec 2007 16:40:04 +0800
> > Subject: [PATCH] gpiolib: mark drivers/i2c/chips/pca9539.c as deprecated
> >
> > use drivers/gpio/pca9539.c instead.
> >
> > Signed-off-by: eric miao <eric.miao@marvell.com>
> > Acked-by: Ben Gardner <bgardner@wabtec.com>
> > ---
> >  Documentation/i2c/chips/pca9539 |    3 +++
> >  drivers/i2c/chips/Kconfig       |    7 +++++--
> >  2 files changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/i2c/chips/pca9539 b/Documentation/i2c/chips/pca9539
> > index c4fce6a..1d81c53 100644
> > --- a/Documentation/i2c/chips/pca9539
> > +++ b/Documentation/i2c/chips/pca9539
> > @@ -1,6 +1,9 @@
> >  Kernel driver pca9539
> >  =====================
> >
> > +NOTE: this driver is deprecated and will be dropped soon, use
> > +drivers/gpio/pca9539.c instead.
> > +
> >  Supported chips:
> >    * Philips PCA9539
> >      Prefix: 'pca9539'
> > diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
> > index 2e1c24f..54fd302 100644
> > --- a/drivers/i2c/chips/Kconfig
> > +++ b/drivers/i2c/chips/Kconfig
> > @@ -66,8 +66,8 @@ config SENSORS_PCF8574
> >         hardware.  If unsure, say N.
> >
> >  config SENSORS_PCA9539
> > -     tristate "Philips PCA9539 16-bit I/O port"
> > -     depends on EXPERIMENTAL
> > +     tristate "Philips PCA9539 16-bit I/O port (DEPRECATED)"
> > +     depends on EXPERIMENTAL && !GPIO_PCA9539
>
> If I remember correctly how the Kconfig language works, this will allow
> for both drivers to be built as modules at the same time. Given that
> they have the same name, which one will be loaded by "modprobe
> pca9539"? I think that you should instead express the dependency as
> "GPIO_PCA9539=n".
>

Indeed, fixed.

> >       help
> >         If you say yes here you get support for the Philips PCA9539
> >         16-bit I/O port.
> > @@ -75,6 +75,9 @@ config SENSORS_PCA9539
> >         This driver can also be built as a module.  If so, the module
> >         will be called pca9539.
> >
> > +       This driver is deprecated and will be dropped soon. Use
> > +       drivers/gpio/pca9539.c instead.
> > +
> >  config SENSORS_PCF8591
> >       tristate "Philips PCF8591"
> >       depends on EXPERIMENTAL
>
> Other than that I'm fine with this approach, note however that it will
> have to go through David rather than me, as I can't merge this before
> the new pca9539 driver.
>
> Thanks,
> --
> Jean Delvare
>

OK, I'll then add your Acked-by :-). Updated as follows:

---- >8 -----
>From 2bd2deff2f417543f0f17ec1aa32d421cc15cf23 Mon Sep 17 00:00:00 2001
From: eric miao <eric.miao@marvell.com>
Date: Wed, 19 Dec 2007 16:40:04 +0800
Subject: [PATCH] gpiolib: mark drivers/i2c/chips/pca9539.c as deprecated

use drivers/gpio/pca9539.c instead.

Signed-off-by: eric miao <eric.miao@marvell.com>
Acked-by: Ben Gardner <bgardner@wabtec.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
---
 Documentation/i2c/chips/pca9539 |    3 +++
 drivers/i2c/chips/Kconfig       |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Documentation/i2c/chips/pca9539 b/Documentation/i2c/chips/pca9539
index c4fce6a..1d81c53 100644
--- a/Documentation/i2c/chips/pca9539
+++ b/Documentation/i2c/chips/pca9539
@@ -1,6 +1,9 @@
 Kernel driver pca9539
 =====================

+NOTE: this driver is deprecated and will be dropped soon, use
+drivers/gpio/pca9539.c instead.
+
 Supported chips:
   * Philips PCA9539
     Prefix: 'pca9539'
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 2e1c24f..7a216f8 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -66,8 +66,8 @@ config SENSORS_PCF8574
 	  hardware.  If unsure, say N.

 config SENSORS_PCA9539
-	tristate "Philips PCA9539 16-bit I/O port"
-	depends on EXPERIMENTAL
+	tristate "Philips PCA9539 16-bit I/O port (DEPRECATED)"
+	depends on EXPERIMENTAL && GPIO_PCA9539 = "n"
 	help
 	  If you say yes here you get support for the Philips PCA9539
 	  16-bit I/O port.
@@ -75,6 +75,9 @@ config SENSORS_PCA9539
 	  This driver can also be built as a module.  If so, the module
 	  will be called pca9539.

+	  This driver is deprecated and will be dropped soon. Use
+	  drivers/gpio/pca9539.c instead.
+
 config SENSORS_PCF8591
 	tristate "Philips PCF8591"
 	depends on EXPERIMENTAL
-- 
1.5.2.5.GIT



-- 
Cheers
- eric