Skip to content

Commit edd220b

Browse files
committed
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>
1 parent cbcd51e commit edd220b

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

drivers/thermal/thermal_core.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,17 +1389,6 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t
13891389
}
13901390
EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);
13911391

1392-
struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask,
1393-
void *devdata, struct thermal_zone_device_ops *ops,
1394-
const struct thermal_zone_params *tzp, int passive_delay,
1395-
int polling_delay)
1396-
{
1397-
return thermal_zone_device_register_with_trips(type, NULL, ntrips, mask,
1398-
devdata, ops, tzp,
1399-
passive_delay, polling_delay);
1400-
}
1401-
EXPORT_SYMBOL_GPL(thermal_zone_device_register);
1402-
14031392
struct thermal_zone_device *thermal_tripless_zone_device_register(
14041393
const char *type,
14051394
void *devdata,

include/linux/thermal.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -300,14 +300,6 @@ int thermal_acpi_critical_trip_temp(struct acpi_device *adev, int *ret_temp);
300300
#endif
301301

302302
#ifdef CONFIG_THERMAL
303-
struct thermal_zone_device *thermal_zone_device_register(
304-
const char *type,
305-
int num_trips, int mask,
306-
void *devdata,
307-
struct thermal_zone_device_ops *ops,
308-
const struct thermal_zone_params *tzp,
309-
int passive_delay, int polling_delay);
310-
311303
struct thermal_zone_device *thermal_zone_device_register_with_trips(
312304
const char *type,
313305
struct thermal_trip *trips,
@@ -364,15 +356,6 @@ int thermal_zone_device_enable(struct thermal_zone_device *tz);
364356
int thermal_zone_device_disable(struct thermal_zone_device *tz);
365357
void thermal_zone_device_critical(struct thermal_zone_device *tz);
366358
#else
367-
static inline struct thermal_zone_device *thermal_zone_device_register(
368-
const char *type,
369-
int num_trips, int mask,
370-
void *devdata,
371-
struct thermal_zone_device_ops *ops,
372-
const struct thermal_zone_params *tzp,
373-
int passive_delay, int polling_delay)
374-
{ return ERR_PTR(-ENODEV); }
375-
376359
static inline struct thermal_zone_device *thermal_zone_device_register_with_trips(
377360
const char *type,
378361
struct thermal_trip *trips,

0 commit comments

Comments
 (0)