Commit 2cb4acf2 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: Remove devm_hwmon_device_unregister() API function 



devm_hwmon_device_unregister() has no in-tree user, and its implementation
is wrong since it does not pass the to-be-removed hardware monitoring
device as parameter. I do not envision a valid use for it; drivers needing
it should not have called devm_hwmon_device_register_with_info() in the
first place. Remove it.

Reported-by: default avatarMatthew Sanders <m@ttsande.rs>
Closes: https://lore.kernel.org/linux-hwmon/488b3bdf870ea76c4b943dbe5fd15ac8113019dc.camel@kernel.org/


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 3017d28d

Documentation/hwmon/hwmon-kernel-api.rst

+0 −7
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ register/unregister functions:: 


  void hwmon_device_unregister(struct device *dev);



  void devm_hwmon_device_unregister(struct device *dev);



  char *hwmon_sanitize_name(const char *name);



  char *devm_hwmon_sanitize_name(struct device *dev, const char *name);
@@ -64,11 +62,6 @@ monitoring device structure. This function must be called from the driver 
remove function if the hardware monitoring device was registered with

hwmon_device_register_with_info.



devm_hwmon_device_unregister does not normally have to be called. It is only

needed for error handling, and only needed if the driver probe fails after

the call to devm_hwmon_device_register_with_info and if the automatic (device

managed) removal would be too late.



All supported hwmon device registration functions only accept valid device

names. Device names including invalid characters (whitespace, '*', or '-')

will be rejected. The 'name' parameter is mandatory.

drivers/hwmon/hwmon.c

+0 −18
Original line number Diff line number Diff line
@@ -1188,24 +1188,6 @@ devm_hwmon_device_register_with_info(struct device *dev, const char *name, 
}

EXPORT_SYMBOL_GPL(devm_hwmon_device_register_with_info);



static int devm_hwmon_match(struct device *dev, void *res, void *data)

{

	struct device **hwdev = res;



	return *hwdev == data;

}



/**

 * devm_hwmon_device_unregister - removes a previously registered hwmon device

 *

 * @dev: the parent device of the device to unregister

 */

void devm_hwmon_device_unregister(struct device *dev)

{

	WARN_ON(devres_release(dev, devm_hwmon_release, devm_hwmon_match, dev));

}

EXPORT_SYMBOL_GPL(devm_hwmon_device_unregister);



static char *__hwmon_sanitize_name(struct device *dev, const char *old_name)

{

	char *name, *p;

include/linux/hwmon.h

+0 −1
Original line number Diff line number Diff line
@@ -481,7 +481,6 @@ devm_hwmon_device_register_with_info(struct device *dev, 
				const struct attribute_group **extra_groups);



void hwmon_device_unregister(struct device *dev);

void devm_hwmon_device_unregister(struct device *dev);



int hwmon_notify_event(struct device *dev, enum hwmon_sensor_types type,

		       u32 attr, int channel);