ACPI: Make sysfs interface in ACPI power optional.

Reference: http://bugzilla.kernel.org/show_bug.cgi?id=9494

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 22 insertions, 1 deletions

diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 22cb95b349e..f136c7d3b3c 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -40,7 +40,9 @@
 #include <linux/jiffies.h>
 #include <linux/delay.h>
 
+#ifdef CONFIG_ACPI_SYSFS_POWER
 #include <linux/power_supply.h>
+#endif
 
 #include "sbshc.h"
 
@@ -80,7 +82,9 @@ static const struct acpi_device_id sbs_device_ids[] = {
 MODULE_DEVICE_TABLE(acpi, sbs_device_ids);
 
 struct acpi_battery {
+#ifdef CONFIG_ACPI_SYSFS_POWER
         struct power_supply bat;
+#endif
         struct acpi_sbs *sbs;
 #ifdef CONFIG_ACPI_PROCFS_POWER
         struct proc_dir_entry *proc_entry;
@@ -113,7 +117,9 @@ struct acpi_battery {
 #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
 
 struct acpi_sbs {
+#ifdef CONFIG_ACPI_SYSFS_POWER
         struct power_supply charger;
+#endif
         struct acpi_device *device;
         struct acpi_smb_hc *hc;
         struct mutex lock;
@@ -157,6 +163,7 @@ static inline int acpi_battery_scale(struct acpi_battery *battery)
             acpi_battery_ipscale(battery);
 }
 
+#ifdef CONFIG_ACPI_SYSFS_POWER
 static int sbs_get_ac_property(struct power_supply *psy,
                                enum power_supply_property psp,
                                union power_supply_propval *val)
@@ -294,6 +301,7 @@ static enum power_supply_property sbs_energy_battery_props[] = {
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
 };
+#endif
 
 /* --------------------------------------------------------------------------
                             Smart Battery System Management
@@ -429,6 +437,7 @@ static int acpi_ac_get_present(struct acpi_sbs *sbs)
         return result;
 }
 
+#ifdef CONFIG_ACPI_SYSFS_POWER
 static ssize_t acpi_battery_alarm_show(struct device *dev,
                                         struct device_attribute *attr,
                                         char *buf)
@@ -458,6 +467,7 @@ static struct device_attribute alarm_attr = {
         .show = acpi_battery_alarm_show,
         .store = acpi_battery_alarm_store,
 };
+#endif
 
 /* --------------------------------------------------------------------------
                               FS Interface (/proc/acpi)
@@ -793,6 +803,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
                         &acpi_battery_state_fops, &acpi_battery_alarm_fops,
                         battery);
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
         battery->bat.name = battery->name;
         battery->bat.type = POWER_SUPPLY_TYPE_BATTERY;
         if (!acpi_battery_mode(battery)) {
@@ -813,6 +824,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
                 goto end;
         battery->have_sysfs_alarm = 1;
       end:
+#endif
         printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n",
                ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
                battery->name, sbs->battery->present ? "present" : "absent");
@@ -822,12 +834,13 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
 static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
 {
         struct acpi_battery *battery = &sbs->battery[id];
-
+#ifdef CONFIG_ACPI_SYSFS_POWER
         if (battery->bat.dev) {
                 if (battery->have_sysfs_alarm)
                         device_remove_file(battery->bat.dev, &alarm_attr);
                 power_supply_unregister(&battery->bat);
         }
+#endif
 #ifdef CONFIG_ACPI_PROCFS_POWER
         if (battery->proc_entry)
                 acpi_sbs_remove_fs(&battery->proc_entry, acpi_battery_dir);
@@ -848,12 +861,14 @@ static int acpi_charger_add(struct acpi_sbs *sbs)
         if (result)
                 goto end;
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
         sbs->charger.name = "sbs-charger";
         sbs->charger.type = POWER_SUPPLY_TYPE_MAINS;
         sbs->charger.properties = sbs_ac_props;
         sbs->charger.num_properties = ARRAY_SIZE(sbs_ac_props);
         sbs->charger.get_property = sbs_get_ac_property;
         power_supply_register(&sbs->device->dev, &sbs->charger);
+#endif
         printk(KERN_INFO PREFIX "%s [%s]: AC Adapter [%s] (%s)\n",
                ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
                ACPI_AC_DIR_NAME, sbs->charger_present ? "on-line" : "off-line");
@@ -863,8 +878,10 @@ static int acpi_charger_add(struct acpi_sbs *sbs)
 
 static void acpi_charger_remove(struct acpi_sbs *sbs)
 {
+#ifdef CONFIG_ACPI_SYSFS_POWER
         if (sbs->charger.dev)
                 power_supply_unregister(&sbs->charger);
+#endif
 #ifdef CONFIG_ACPI_PROCFS_POWER
         if (sbs->charger_entry)
                 acpi_sbs_remove_fs(&sbs->charger_entry, acpi_ac_dir);
@@ -885,7 +902,9 @@ void acpi_sbs_callback(void *context)
                                               ACPI_SBS_NOTIFY_STATUS,
                                               sbs->charger_present);
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
                 kobject_uevent(&sbs->charger.dev->kobj, KOBJ_CHANGE);
+#endif
         }
         if (sbs->manager_present) {
                 for (id = 0; id < MAX_SBS_BAT; ++id) {
@@ -902,7 +921,9 @@ void acpi_sbs_callback(void *context)
                                                       ACPI_SBS_NOTIFY_STATUS,
                                                       bat->present);
 #endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
                         kobject_uevent(&bat->bat.dev->kobj, KOBJ_CHANGE);
+#endif
                 }
         }
 }