X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbattery.c;h=952c56c071f854e0c3fbbc3d12ba7866f2c420bc;hb=39ab70bc40bb5e68c970b694c52c832ddfd5303a;hp=bdf461945c7e780be1ed0e7d383054b0c046c7c6;hpb=dc80c73c20ef0e69c3850fd9679a827ad79e61a1;p=collectd.git

diff --git a/src/battery.c b/src/battery.c
index bdf46194..952c56c0 100644
--- a/src/battery.c
+++ b/src/battery.c
@@ -56,36 +56,6 @@
 
 #define INVALID_VALUE 47841.29
 
-static data_source_t data_source_charge[1] =
-{
-	{"value", DS_TYPE_GAUGE, 0, NAN}
-};
-
-static data_set_t charge_ds =
-{
-	"charge", 1, data_source_charge
-};
-
-static data_source_t data_source_current[1] =
-{
-	{"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t current_ds =
-{
-	"current", 1, data_source_current
-};
-
-static data_source_t data_source_voltage[1] =
-{
-	{"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t voltage_ds =
-{
-	"voltage", 1, data_source_voltage
-};
-
 #if BATTERY_HAVE_READ
 #if HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H
 	/* No global variables */
@@ -555,20 +525,10 @@ static int battery_read (void)
 }
 #endif /* BATTERY_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-	{
-		plugin_register_data_set (&charge_ds);
-		plugin_register_data_set (&current_ds);
-		plugin_register_data_set (&voltage_ds);
-	}
-
 #if BATTERY_HAVE_READ
-	if (load & MR_READ)
-	{
-		plugin_register_init ("battery", battery_init);
-		plugin_register_read ("battery", battery_read);
-	}
+	plugin_register_init ("battery", battery_init);
+	plugin_register_read ("battery", battery_read);
 #endif /* BATTERY_HAVE_READ */
 } /* void module_register */