lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Mon, 3 Nov 2008 21:29:55 +0300
From:	Dmitry Baryshkov <dbaryshkov@...il.com>
To:	Anton Vorontsov <avorontsov@...mvista.com>
Cc:	linux-kernel@...r.kernel.org, cbou@...l.ru,
	Andrew Morton <akpm@...ux-foundation.org>,
	Marek Vasut <marek.vasut@...il.com>,
	Jonathan Cameron <Jonathan.Cameron@...il.com>
Subject: Re: [PATCH] power_supply: change the way how wm97xx-bat driver is
	registered

On Mon, Nov 03, 2008 at 06:11:51PM +0300, Anton Vorontsov wrote:
> On Wed, Oct 29, 2008 at 12:04:10PM +0300, Dmitry Baryshkov wrote:
> >  #ifdef CONFIG_BATTERY_WM97XX
> > -void __init wm97xx_bat_set_pdata(struct wm97xx_batt_info *data);
> > +int wm97xx_bat_set_pdata(struct wm97xx_batt_info *data);
> >  #else
> > -static inline void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data) {}
> > +static inline int wm97xx_bat_set_pdata(struct wm97xx_batt_info *data)
> > +{
> > +	return -ENODEV;
> > +}
> >  #endif
> 
> How that supposed to work when BATTERY_WM97XX is a module?
> #ifdef CONFIG_BATTERY_WM97XX will evaluate to false, and you'll have
> dummy wm97xx_bat_set_pdata() that returns -ENODEV...

This won't of course fix the wm97xx driver model, but the module issue
should be fixed. What about this patch?


>From f4b2e46cbac0d3ce77643c008d44fdaea8864366 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dbaryshkov@...il.com>
Date: Wed, 29 Oct 2008 12:00:57 +0300
Subject: [PATCH] power_supply: change the way how wm97xx-bat driver is registered

Do register the driver from wm97xx_bat_set_pdata instead of module init.
This has several positive outcome points:
1) This driver for wm97xx-battery is now registered on demand, thus allowing
  other driver (e.g. tosa-battery) to claim the battery.
2) After dropping __init from wm97xx_bat_set_pdata(), the wm97xx_bat driver
  can be correctly built as a module. Then one can request it and set the
  battery data.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@...il.com>
Cc: Marek Vasut <marek.vasut@...il.com>

Signed-off-by: Dmitry Baryshkov <dbaryshkov@...il.com>
---
 drivers/power/Kconfig          |    4 ++--
 drivers/power/wm97xx_battery.c |   12 +++++-------
 include/linux/wm97xx_batt.h    |    9 ++++++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 8e0c2b4..053f20b 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -57,8 +57,8 @@ config BATTERY_TOSA
 	  SL-6000 (tosa) models.
 
 config BATTERY_WM97XX
-	bool "WM97xx generic battery driver"
-	depends on TOUCHSCREEN_WM97XX=y
+	tristate "WM97xx generic battery driver"
+	depends on TOUCHSCREEN_WM97XX
 	help
 	  Say Y to enable support for battery measured by WM97xx aux port.
 
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index 8bde921..94727dc 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -248,23 +248,21 @@ static struct platform_driver wm97xx_bat_driver = {
 	.resume		= wm97xx_bat_resume,
 };
 
-static int __init wm97xx_bat_init(void)
-{
-	return platform_driver_register(&wm97xx_bat_driver);
-}
-
 static void __exit wm97xx_bat_exit(void)
 {
 	platform_driver_unregister(&wm97xx_bat_driver);
 }
 
-void __init wm97xx_bat_set_pdata(struct wm97xx_batt_info *data)
+int wm97xx_bat_set_pdata(struct wm97xx_batt_info *data)
 {
+	if (pdata)
+		return -EEXIST;
+
 	pdata = data;
+	return platform_driver_register(&wm97xx_bat_driver);
 }
 EXPORT_SYMBOL_GPL(wm97xx_bat_set_pdata);
 
-module_init(wm97xx_bat_init);
 module_exit(wm97xx_bat_exit);
 
 MODULE_LICENSE("GPL");
diff --git a/include/linux/wm97xx_batt.h b/include/linux/wm97xx_batt.h
index 9681d1a..eb9cbf3 100644
--- a/include/linux/wm97xx_batt.h
+++ b/include/linux/wm97xx_batt.h
@@ -17,10 +17,13 @@ struct wm97xx_batt_info {
 	char	*batt_name;
 };
 
-#ifdef CONFIG_BATTERY_WM97XX
-void __init wm97xx_bat_set_pdata(struct wm97xx_batt_info *data);
+#if defined(CONFIG_BATTERY_WM97XX) || defined(CONFIG_BATTERY_WM97XX_MODULE)
+int wm97xx_bat_set_pdata(struct wm97xx_batt_info *data);
 #else
-static inline void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data) {}
+static inline int wm97xx_bat_set_pdata(struct wm97xx_batt_info *data)
+{
+	return -ENODEV;
+}
 #endif
 
 #endif
-- 
1.5.6.5


-- 
With best wishes
Dmitry

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists