Re: [PATCH] ds2760_battery: add HAS_IOMEM dependency

[Martin Schwidefsky <schwidefsky@de.ibm.com>]

On Thu, 23 Sep 2010 14:57:27 +0400
Anton Vorontsov <cbouatmailru@gmail.com> wrote:

> On Thu, Sep 23, 2010 at 12:44:45PM +0200, Martin Schwidefsky wrote:
> > From: Martin Schwidefsky <schwidefsky@de.ibm.com>
> > 
> > Fix this Kconfig warning on allmodconfig for s390:
> > 
> > warning: (BATTERY_DS2760 && POWER_SUPPLY) selects W1 which has unmet direct dependencies (HAS_IOMEM)
> > 
> > Cc: Anton Vorontsov <cbou@mail.ru>
> > Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
> > ---
> > 
> >  drivers/power/Kconfig |    1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff -urpN linux-2.6/drivers/power/Kconfig linux-2.6-patched/drivers/power/Kconfig
> > --- linux-2.6/drivers/power/Kconfig	2010-09-23 08:47:36.000000000 +0200
> > +++ linux-2.6-patched/drivers/power/Kconfig	2010-09-23 08:47:39.000000000 +0200
> > @@ -64,6 +64,7 @@ config TEST_POWER
> >  
> >  config BATTERY_DS2760
> >  	tristate "DS2760 battery driver (HP iPAQ & others)"
> > +	depends on HAS_IOMEM
> >  	select W1
> >  	select W1_SLAVE_DS2760
> 
> I think the better fix would be to turn this into 'depends on W1',
> and remove these selects.

That would work as well. Dunno what is better, W1 is a bus for a certain
class of devices. The bus is only needed if at least one driver that uses
it is configured. Which would argue for the select method but that has
the dependency problem. Anyway, either method is fine with me. If you
prefer the "depends on W1" lets do it that way.
--
[PATCH] ds2760_battery: fix W1 and W1_SLAVE_DS2760 dependency

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Fix this Kconfig warning on allmodconfig for s390:

warning: (BATTERY_DS2760 && POWER_SUPPLY) selects W1 which has unmet direct dependencies (HAS_IOMEM)

Cc: Anton Vorontsov <cbou@mail.ru>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

 drivers/power/Kconfig |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff -urpN linux-2.6/drivers/power/Kconfig linux-2.6-patched/drivers/power/Kconfig
--- linux-2.6/drivers/power/Kconfig	2010-09-23 15:18:00.000000000 +0200
+++ linux-2.6-patched/drivers/power/Kconfig	2010-09-23 15:18:46.000000000 +0200
@@ -64,8 +64,7 @@ config TEST_POWER
 
 config BATTERY_DS2760
 	tristate "DS2760 battery driver (HP iPAQ & others)"
-	select W1
-	select W1_SLAVE_DS2760
+	depends on W1 && W1_SLAVE_DS2760
 	help
 	  Say Y here to enable support for batteries with ds2760 chip.
 

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.