power: supply: ab8500: Drop unnecessary NULL check after container_of

Message ID 20210511203711.1673001-1-linux@roeck-us.net
State New
Headers show
Series
  • power: supply: ab8500: Drop unnecessary NULL check after container_of
Related show

Commit Message

Guenter Roeck May 11, 2021, 8:37 p.m.
The result of container_of() operations is never NULL unless the element
is the first element of the embedded structure, which is not the case here.
The NULL check is therefore unnecessary and misleading. Remove it.

This change was made automatically with the following Coccinelle script.

@@
type t;
identifier v;
statement s;
@@

<+...
(
  t v = container_of(...);
|
  v = container_of(...);
)
  ...
  when != v
- if (\( !v \| v == NULL \) ) s
...+>

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/power/supply/ab8500_charger.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Sebastian Reichel June 3, 2021, 4:52 p.m. | #1
Hi,

On Tue, May 11, 2021 at 01:37:11PM -0700, Guenter Roeck wrote:
> The result of container_of() operations is never NULL unless the element

> is the first element of the embedded structure, which is not the case here.

> The NULL check is therefore unnecessary and misleading. Remove it.

> 

> This change was made automatically with the following Coccinelle script.

> 

> @@

> type t;

> identifier v;

> statement s;

> @@

> 

> <+...

> (

>   t v = container_of(...);

> |

>   v = container_of(...);

> )

>   ...

>   when != v

> - if (\( !v \| v == NULL \) ) s

> ...+>

> 

> Signed-off-by: Guenter Roeck <linux@roeck-us.net>

> ---


Thanks, queued.

-- Sebastian

>  drivers/power/supply/ab8500_charger.c | 3 ---

>  1 file changed, 3 deletions(-)

> 

> diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c

> index a9be10eb2c22..f407cec49aa3 100644

> --- a/drivers/power/supply/ab8500_charger.c

> +++ b/drivers/power/supply/ab8500_charger.c

> @@ -3171,9 +3171,6 @@ static int ab8500_charger_usb_notifier_call(struct notifier_block *nb,

>  	enum ab8500_usb_state bm_usb_state;

>  	unsigned mA = *((unsigned *)power);

>  

> -	if (!di)

> -		return NOTIFY_DONE;

> -

>  	if (event != USB_EVENT_VBUS) {

>  		dev_dbg(di->dev, "not a standard host, returning\n");

>  		return NOTIFY_DONE;

> -- 

> 2.25.1

>

Patch

diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c
index a9be10eb2c22..f407cec49aa3 100644
--- a/drivers/power/supply/ab8500_charger.c
+++ b/drivers/power/supply/ab8500_charger.c
@@ -3171,9 +3171,6 @@  static int ab8500_charger_usb_notifier_call(struct notifier_block *nb,
 	enum ab8500_usb_state bm_usb_state;
 	unsigned mA = *((unsigned *)power);
 
-	if (!di)
-		return NOTIFY_DONE;
-
 	if (event != USB_EVENT_VBUS) {
 		dev_dbg(di->dev, "not a standard host, returning\n");
 		return NOTIFY_DONE;