Commit 2b329f56 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Hans de Goede
Browse files

platform/x86: wmi: Make remove callback return void 



The driver core ignores the return value of struct bus_type::remove()
(and so wmi_dev_remove()) because there is only little that can be done.

To simplify the quest to make this function return void, let struct
wmi_driver::remove() return void, too. All implementers of this callback
return 0 already and this way it should be obvious to driver authors
that returning an error code is a bad idea.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarPali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20210301160404.1677064-1-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 24789075

drivers/platform/x86/dell/dell-smbios-wmi.c

+1 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int dell_smbios_wmi_probe(struct wmi_device *wdev, const void *context) 
	return ret;

}



static int dell_smbios_wmi_remove(struct wmi_device *wdev)

static void dell_smbios_wmi_remove(struct wmi_device *wdev)

{

	struct wmi_smbios_priv *priv = dev_get_drvdata(&wdev->dev);

	int count;
@@ -218,7 +218,6 @@ static int dell_smbios_wmi_remove(struct wmi_device *wdev) 
	count = get_order(priv->req_buf_size);

	free_pages((unsigned long)priv->buf, count);

	mutex_unlock(&call_mutex);

	return 0;

}



static const struct wmi_device_id dell_smbios_wmi_id_table[] = {

drivers/platform/x86/dell/dell-wmi-descriptor.c

+1 −2
Original line number Diff line number Diff line
@@ -174,14 +174,13 @@ static int dell_wmi_descriptor_probe(struct wmi_device *wdev, 
	return ret;

}



static int dell_wmi_descriptor_remove(struct wmi_device *wdev)

static void dell_wmi_descriptor_remove(struct wmi_device *wdev)

{

	struct descriptor_priv *priv = dev_get_drvdata(&wdev->dev);



	mutex_lock(&list_mutex);

	list_del(&priv->list);

	mutex_unlock(&list_mutex);

	return 0;

}



static const struct wmi_device_id dell_wmi_descriptor_id_table[] = {

drivers/platform/x86/dell/dell-wmi-sysman/biosattr-interface.c

+1 −2
Original line number Diff line number Diff line
@@ -152,12 +152,11 @@ static int bios_attr_set_interface_probe(struct wmi_device *wdev, const void *co 
	return 0;

}



static int bios_attr_set_interface_remove(struct wmi_device *wdev)

static void bios_attr_set_interface_remove(struct wmi_device *wdev)

{

	mutex_lock(&wmi_priv.mutex);

	wmi_priv.bios_attr_wdev = NULL;

	mutex_unlock(&wmi_priv.mutex);

	return 0;

}



static const struct wmi_device_id bios_attr_set_interface_id_table[] = {

drivers/platform/x86/dell/dell-wmi-sysman/passwordattr-interface.c

+1 −2
Original line number Diff line number Diff line
@@ -119,12 +119,11 @@ static int bios_attr_pass_interface_probe(struct wmi_device *wdev, const void *c 
	return 0;

}



static int bios_attr_pass_interface_remove(struct wmi_device *wdev)

static void bios_attr_pass_interface_remove(struct wmi_device *wdev)

{

	mutex_lock(&wmi_priv.mutex);

	wmi_priv.password_attr_wdev = NULL;

	mutex_unlock(&wmi_priv.mutex);

	return 0;

}



static const struct wmi_device_id bios_attr_pass_interface_id_table[] = {

drivers/platform/x86/dell/dell-wmi.c

+1 −2
Original line number Diff line number Diff line
@@ -714,10 +714,9 @@ static int dell_wmi_probe(struct wmi_device *wdev, const void *context) 
	return dell_wmi_input_setup(wdev);

}



static int dell_wmi_remove(struct wmi_device *wdev)

static void dell_wmi_remove(struct wmi_device *wdev)

{

	dell_wmi_input_destroy(wdev);

	return 0;

}

static const struct wmi_device_id dell_wmi_id_table[] = {

	{ .guid_string = DELL_EVENT_GUID },