thermal: core: Drop thermal_zone_device_register()

There are no more users of thermal_zone_device_register(), so drop it
from the core.

Note that thermal_zone_device_register_with_trips() may be renamed to
thermal_zone_device_register() in the future, but only after a grace
period allowing all of the possible work in progress that may be using
the latter to adjust.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 33ebec043800c0aee244be225221710497fb5866..8717a33435125ca33009e79afd89983c1a742dda 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1389,17 +1389,6 @@ free_tz:
 }
 EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);
 
-struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask,
-                                                        void *devdata, struct thermal_zone_device_ops *ops,
-                                                        const struct thermal_zone_params *tzp, int passive_delay,
-                                                        int polling_delay)
-{
-       return thermal_zone_device_register_with_trips(type, NULL, ntrips, mask,
-                                                      devdata, ops, tzp,
-                                                      passive_delay, polling_delay);
-}
-EXPORT_SYMBOL_GPL(thermal_zone_device_register);
-
 struct thermal_zone_device *thermal_tripless_zone_device_register(
                                        const char *type,
                                        void *devdata,

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 1a1433eb9b59659a498145af86f1d8a7788382e8..c99440aac1a11dfd59497fa4d1cce94c1668afcf 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -300,14 +300,6 @@ int thermal_acpi_critical_trip_temp(struct acpi_device *adev, int *ret_temp);
 #endif
 
 #ifdef CONFIG_THERMAL
-struct thermal_zone_device *thermal_zone_device_register(
-                                       const char *type,
-                                       int num_trips, int mask,
-                                       void *devdata,
-                                       struct thermal_zone_device_ops *ops,
-                                       const struct thermal_zone_params *tzp,
-                                       int passive_delay, int polling_delay);
-
 struct thermal_zone_device *thermal_zone_device_register_with_trips(
                                        const char *type,
                                        struct thermal_trip *trips,
@@ -364,15 +356,6 @@ int thermal_zone_device_enable(struct thermal_zone_device *tz);
 int thermal_zone_device_disable(struct thermal_zone_device *tz);
 void thermal_zone_device_critical(struct thermal_zone_device *tz);
 #else
-static inline struct thermal_zone_device *thermal_zone_device_register(
-                                       const char *type,
-                                       int num_trips, int mask,
-                                       void *devdata,
-                                       struct thermal_zone_device_ops *ops,
-                                       const struct thermal_zone_params *tzp,
-                                       int passive_delay, int polling_delay)
-{ return ERR_PTR(-ENODEV); }
-
 static inline struct thermal_zone_device *thermal_zone_device_register_with_trips(
                                        const char *type,
                                        struct thermal_trip *trips,