diff mbox series

[RFC,v1,05/30] platform/x86: wmi: remove unnecessary initializations

Message ID 20210904175450.156801-6-pobrn@protonmail.com (mailing list archive)
State Accepted, archived
Headers show
Series platform/x86: wmi: minor improvements | expand

Commit Message

Barnabás Pőcze Sept. 4, 2021, 5:55 p.m. UTC 
Some pointers are initialized when they are defined,
but they are almost immediately reassigned in the
following lines. Remove these superfluous assignments.

Signed-off-by: Barnabás Pőcze <pobrn@protonmail.com>
---
 drivers/platform/x86/wmi.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

--
2.33.0

Comments

Hans de Goede Sept. 13, 2021, 9:23 a.m. UTC | #1 
Hi,

On 9/4/21 7:55 PM, Barnabás Pőcze wrote:
> Some pointers are initialized when they are defined,
> but they are almost immediately reassigned in the
> following lines. Remove these superfluous assignments.
> 
> Signed-off-by: Barnabás Pőcze <pobrn@protonmail.com>

Erm so when I said "patch 6" in my reply to the cover-letter
I meant this one, sorry.

> ---
>  drivers/platform/x86/wmi.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
> index 6ad5962da59b..36890e301df5 100644
> --- a/drivers/platform/x86/wmi.c
> +++ b/drivers/platform/x86/wmi.c
> @@ -177,7 +177,7 @@ static int get_subobj_info(acpi_handle handle, const char *pathname,
> 
>  static acpi_status wmi_method_enable(struct wmi_block *wblock, int enable)
>  {
> -	struct guid_block *block = NULL;
> +	struct guid_block *block;
>  	char method[5];
>  	acpi_status status;
>  	acpi_handle handle;
> @@ -229,7 +229,7 @@ EXPORT_SYMBOL_GPL(set_required_buffer_size);
>  acpi_status wmi_evaluate_method(const char *guid_string, u8 instance,
>  u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out)
>  {
> -	struct wmi_block *wblock = NULL;
> +	struct wmi_block *wblock;
> 
>  	if (!find_guid(guid_string, &wblock))
>  		return AE_ERROR;

Here the pointer is not directly assigned but rather passed to
find_guid for it to fill it, in cases like these I prefer to
keep the NULL initialization, so I've dropped this chunk of the patch.

I've also dropped similar changes in wmi_set_block() and
wmi_get_acpi_device_uid(). I've made these changes while applying the
patch to my review-hans branch.

Regards,

Hans



> @@ -251,8 +251,8 @@ EXPORT_SYMBOL_GPL(wmi_evaluate_method);
>  acpi_status wmidev_evaluate_method(struct wmi_device *wdev, u8 instance,
>  	u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out)
>  {
> -	struct guid_block *block = NULL;
> -	struct wmi_block *wblock = NULL;
> +	struct guid_block *block;
> +	struct wmi_block *wblock;
>  	acpi_handle handle;
>  	acpi_status status;
>  	struct acpi_object_list input;
> @@ -299,7 +299,7 @@ EXPORT_SYMBOL_GPL(wmidev_evaluate_method);
>  static acpi_status __query_block(struct wmi_block *wblock, u8 instance,
>  				 struct acpi_buffer *out)
>  {
> -	struct guid_block *block = NULL;
> +	struct guid_block *block;
>  	acpi_handle handle;
>  	acpi_status status, wc_status = AE_ERROR;
>  	struct acpi_object_list input;
> @@ -405,8 +405,8 @@ EXPORT_SYMBOL_GPL(wmidev_block_query);
>  acpi_status wmi_set_block(const char *guid_string, u8 instance,
>  			  const struct acpi_buffer *in)
>  {
> -	struct guid_block *block = NULL;
> -	struct wmi_block *wblock = NULL;
> +	struct guid_block *block;
> +	struct wmi_block *wblock;
>  	acpi_handle handle;
>  	struct acpi_object_list input;
>  	union acpi_object params[2];
> @@ -650,7 +650,7 @@ EXPORT_SYMBOL_GPL(wmi_has_guid);
>   */
>  char *wmi_get_acpi_device_uid(const char *guid_string)
>  {
> -	struct wmi_block *wblock = NULL;
> +	struct wmi_block *wblock;
> 
>  	if (!find_guid(guid_string, &wblock))
>  		return NULL;
> @@ -811,8 +811,8 @@ static int wmi_dev_match(struct device *dev, struct device_driver *driver)
>  static int wmi_char_open(struct inode *inode, struct file *filp)
>  {
>  	const char *driver_name = filp->f_path.dentry->d_iname;
> -	struct wmi_block *wblock = NULL;
> -	struct wmi_block *next = NULL;
> +	struct wmi_block *wblock;
> +	struct wmi_block *next;
> 
>  	list_for_each_entry_safe(wblock, next, &wmi_block_list, list) {
>  		if (!wblock->dev.dev.driver)
> @@ -844,8 +844,8 @@ static long wmi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
>  	struct wmi_ioctl_buffer __user *input =
>  		(struct wmi_ioctl_buffer __user *) arg;
>  	struct wmi_block *wblock = filp->private_data;
> -	struct wmi_ioctl_buffer *buf = NULL;
> -	struct wmi_driver *wdriver = NULL;
> +	struct wmi_ioctl_buffer *buf;
> +	struct wmi_driver *wdriver;
>  	int ret;
> 
>  	if (_IOC_TYPE(cmd) != WMI_IOC)
> --
> 2.33.0
> 
>
diff mbox series

Patch

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 6ad5962da59b..36890e301df5 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -177,7 +177,7 @@  static int get_subobj_info(acpi_handle handle, const char *pathname,

 static acpi_status wmi_method_enable(struct wmi_block *wblock, int enable)
 {
-	struct guid_block *block = NULL;
+	struct guid_block *block;
 	char method[5];
 	acpi_status status;
 	acpi_handle handle;
@@ -229,7 +229,7 @@  EXPORT_SYMBOL_GPL(set_required_buffer_size);
 acpi_status wmi_evaluate_method(const char *guid_string, u8 instance,
 u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out)
 {
-	struct wmi_block *wblock = NULL;
+	struct wmi_block *wblock;

 	if (!find_guid(guid_string, &wblock))
 		return AE_ERROR;
@@ -251,8 +251,8 @@  EXPORT_SYMBOL_GPL(wmi_evaluate_method);
 acpi_status wmidev_evaluate_method(struct wmi_device *wdev, u8 instance,
 	u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out)
 {
-	struct guid_block *block = NULL;
-	struct wmi_block *wblock = NULL;
+	struct guid_block *block;
+	struct wmi_block *wblock;
 	acpi_handle handle;
 	acpi_status status;
 	struct acpi_object_list input;
@@ -299,7 +299,7 @@  EXPORT_SYMBOL_GPL(wmidev_evaluate_method);
 static acpi_status __query_block(struct wmi_block *wblock, u8 instance,
 				 struct acpi_buffer *out)
 {
-	struct guid_block *block = NULL;
+	struct guid_block *block;
 	acpi_handle handle;
 	acpi_status status, wc_status = AE_ERROR;
 	struct acpi_object_list input;
@@ -405,8 +405,8 @@  EXPORT_SYMBOL_GPL(wmidev_block_query);
 acpi_status wmi_set_block(const char *guid_string, u8 instance,
 			  const struct acpi_buffer *in)
 {
-	struct guid_block *block = NULL;
-	struct wmi_block *wblock = NULL;
+	struct guid_block *block;
+	struct wmi_block *wblock;
 	acpi_handle handle;
 	struct acpi_object_list input;
 	union acpi_object params[2];
@@ -650,7 +650,7 @@  EXPORT_SYMBOL_GPL(wmi_has_guid);
  */
 char *wmi_get_acpi_device_uid(const char *guid_string)
 {
-	struct wmi_block *wblock = NULL;
+	struct wmi_block *wblock;

 	if (!find_guid(guid_string, &wblock))
 		return NULL;
@@ -811,8 +811,8 @@  static int wmi_dev_match(struct device *dev, struct device_driver *driver)
 static int wmi_char_open(struct inode *inode, struct file *filp)
 {
 	const char *driver_name = filp->f_path.dentry->d_iname;
-	struct wmi_block *wblock = NULL;
-	struct wmi_block *next = NULL;
+	struct wmi_block *wblock;
+	struct wmi_block *next;

 	list_for_each_entry_safe(wblock, next, &wmi_block_list, list) {
 		if (!wblock->dev.dev.driver)
@@ -844,8 +844,8 @@  static long wmi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	struct wmi_ioctl_buffer __user *input =
 		(struct wmi_ioctl_buffer __user *) arg;
 	struct wmi_block *wblock = filp->private_data;
-	struct wmi_ioctl_buffer *buf = NULL;
-	struct wmi_driver *wdriver = NULL;
+	struct wmi_ioctl_buffer *buf;
+	struct wmi_driver *wdriver;
 	int ret;

 	if (_IOC_TYPE(cmd) != WMI_IOC)