Commit a0dd25b2 authored by Len Brown's avatar Len Brown
Browse files

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: default avatarLen Brown <len.brown@intel.com>
parent a6869cc4

include/linux/thermal.h

+20 −3
Original line number Diff line number Diff line
@@ -79,7 +79,9 @@ struct thermal_zone_device { 
};



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 *);



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,

				       struct thermal_cooling_device *);



#ifdef	CONFIG_THERMAL

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 *);

#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__ */