mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
ACPI: thermal: buildfix for CONFIG_THERMAL=n
This fixes the build, but acpi_fan_add() still needs to be updated to handle thermal_cooling_device_register() returning NULL as a non-fatal condition. Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
a6869cc4cf
commit
a0dd25b2c8
1 changed files with 20 additions and 3 deletions
|
@ -79,7 +79,9 @@ struct thermal_zone_device {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
|
struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
|
||||||
struct thermal_zone_device_ops *);
|
struct
|
||||||
|
thermal_zone_device_ops
|
||||||
|
*);
|
||||||
void thermal_zone_device_unregister(struct thermal_zone_device *);
|
void thermal_zone_device_unregister(struct thermal_zone_device *);
|
||||||
|
|
||||||
int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
|
int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
|
||||||
|
@ -87,8 +89,23 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
|
||||||
int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
|
int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
|
||||||
struct thermal_cooling_device *);
|
struct thermal_cooling_device *);
|
||||||
|
|
||||||
|
#ifdef CONFIG_THERMAL
|
||||||
struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
|
struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
|
||||||
struct thermal_cooling_device_ops *);
|
struct
|
||||||
|
thermal_cooling_device_ops
|
||||||
|
*);
|
||||||
void thermal_cooling_device_unregister(struct thermal_cooling_device *);
|
void thermal_cooling_device_unregister(struct thermal_cooling_device *);
|
||||||
|
#else
|
||||||
|
static inline struct thermal_cooling_device
|
||||||
|
*thermal_cooling_device_register(char *c, void *v,
|
||||||
|
struct thermal_cooling_device_ops *t)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
static inline
|
||||||
|
void thermal_cooling_device_unregister(struct thermal_cooling_device *t)
|
||||||
|
{
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __THERMAL_H__ */
|
#endif /* __THERMAL_H__ */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue