staging: greybus: power_supply: remove KERNEL_VERSION checks

No need to support older kernel versions in the Greybus Power Supply
driver, so remove the checks as needed, we can now rely on all of the
correct Power Supply core apis being present. Also move some properties
definitions to the power supply greybus code.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/kernel_ver.h b/drivers/staging/greybus/kernel_ver.h
index 1d93fb020961abe3a0b830536272e465a0882f30..cfd7bc7d40766cdd288f359586f135f9c6bedb2b 100644 (file)
--- a/drivers/staging/greybus/kernel_ver.h
+++ b/drivers/staging/greybus/kernel_ver.h
@@ -17,32 +17,6 @@
 #include <linux/kernel.h>
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
-/* Commit: 297d716 power_supply: Change ownership from driver to core */
-#define CORE_OWNS_PSY_STRUCT
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
-/*
- * Power supply get by name need to drop reference after call
- */
-#define PSY_HAVE_PUT
-#endif
-
-/*
- * General power supply properties that could be absent from various reasons,
- * like kernel versions or vendor specific versions
- */
-#ifndef POWER_SUPPLY_PROP_VOLTAGE_BOOT
-       #define POWER_SUPPLY_PROP_VOLTAGE_BOOT  -1
-#endif
-#ifndef POWER_SUPPLY_PROP_CURRENT_BOOT
-       #define POWER_SUPPLY_PROP_CURRENT_BOOT  -1
-#endif
-#ifndef POWER_SUPPLY_PROP_CALIBRATE
-       #define POWER_SUPPLY_PROP_CALIBRATE     -1
-#endif
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
 /*
  * After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is

diff --git a/drivers/staging/greybus/power_supply.c b/drivers/staging/greybus/power_supply.c
index 68dd3d2f758500d8b0ade6c9d932581619f64a52..e85c988b7034ca579c3006042fbb86a1a66617b4 100644 (file)
--- a/drivers/staging/greybus/power_supply.c
+++ b/drivers/staging/greybus/power_supply.c
@@ -27,14 +27,8 @@ struct gb_power_supply_prop {
 struct gb_power_supply {
        u8                              id;
        bool                            registered;
-#ifndef CORE_OWNS_PSY_STRUCT
-       struct power_supply             psy;
-#define to_gb_power_supply(x) container_of(x, struct gb_power_supply, psy)
-#else
        struct power_supply             *psy;
        struct power_supply_desc        desc;
-#define to_gb_power_supply(x) power_supply_get_drvdata(x)
-#endif
        char                            name[64];
        struct gb_power_supplies        *supplies;
        struct delayed_work             work;
@@ -61,6 +55,22 @@ struct gb_power_supplies {
        struct mutex            supplies_lock;
 };
 
+#define to_gb_power_supply(x) power_supply_get_drvdata(x)
+
+/*
+ * General power supply properties that could be absent from various reasons,
+ * like kernel versions or vendor specific versions
+ */
+#ifndef POWER_SUPPLY_PROP_VOLTAGE_BOOT
+       #define POWER_SUPPLY_PROP_VOLTAGE_BOOT  -1
+#endif
+#ifndef POWER_SUPPLY_PROP_CURRENT_BOOT
+       #define POWER_SUPPLY_PROP_CURRENT_BOOT  -1
+#endif
+#ifndef POWER_SUPPLY_PROP_CALIBRATE
+       #define POWER_SUPPLY_PROP_CALIBRATE     -1
+#endif
+
 /* cache time in milliseconds, if cache_time is set to 0 cache is disable */
 static unsigned int cache_time = 1000;
 /*
@@ -342,17 +352,10 @@ static void next_interval(struct gb_power_supply *gbpsy)
                gbpsy->update_interval = update_interval_max;
 }
 
-#ifndef CORE_OWNS_PSY_STRUCT
-static void __gb_power_supply_changed(struct gb_power_supply *gbpsy)
-{
-       power_supply_changed(&gbpsy->psy);
-}
-#else
 static void __gb_power_supply_changed(struct gb_power_supply *gbpsy)
 {
        power_supply_changed(gbpsy->psy);
 }
-#endif
 
 static void gb_power_supply_state_change(struct gb_power_supply *gbpsy,
                                         struct gb_power_supply_prop *prop)
@@ -451,9 +454,8 @@ static int __gb_power_supply_set_name(char *init_name, char *name, size_t len)
        strlcpy(name, init_name, len);
 
        while ((ret < len) && (psy = power_supply_get_by_name(name))) {
-#ifdef PSY_HAVE_PUT
                power_supply_put(psy);
-#endif
+
                ret = snprintf(name, len, "%s_%u", init_name, ++i);
        }
        if (ret >= len)
@@ -814,23 +816,6 @@ static int property_is_writeable(struct power_supply *b,
        return is_psy_prop_writeable(gbpsy, psp);
 }
 
-#ifndef CORE_OWNS_PSY_STRUCT
-static int gb_power_supply_register(struct gb_power_supply *gbpsy)
-{
-       struct gb_connection *connection = get_conn_from_psy(gbpsy);
-
-       gbpsy->psy.name                 = gbpsy->name;
-       gbpsy->psy.type                 = gbpsy->type;
-       gbpsy->psy.properties           = gbpsy->props_raw;
-       gbpsy->psy.num_properties       = total_props(gbpsy);
-       gbpsy->psy.get_property         = get_property;
-       gbpsy->psy.set_property         = set_property;
-       gbpsy->psy.property_is_writeable = property_is_writeable;
-
-       return power_supply_register(&connection->bundle->dev,
-                                    &gbpsy->psy);
-}
-#else
 static int gb_power_supply_register(struct gb_power_supply *gbpsy)
 {
        struct gb_connection *connection = get_conn_from_psy(gbpsy);
@@ -850,7 +835,6 @@ static int gb_power_supply_register(struct gb_power_supply *gbpsy)
                                           &gbpsy->desc, &cfg);
        return PTR_ERR_OR_ZERO(gbpsy->psy);
 }
-#endif
 
 static void _gb_power_supply_free(struct gb_power_supply *gbpsy)
 {
@@ -866,13 +850,9 @@ static void _gb_power_supply_release(struct gb_power_supply *gbpsy)
        gbpsy->update_interval = 0;
 
        cancel_delayed_work_sync(&gbpsy->work);
-#ifndef CORE_OWNS_PSY_STRUCT
-       if (gbpsy->registered)
-               power_supply_unregister(&gbpsy->psy);
-#else
+
        if (gbpsy->registered)
                power_supply_unregister(gbpsy->psy);
-#endif
 
        _gb_power_supply_free(gbpsy);
 }