| Message ID | 20240731095345.2878-1-ilpo.jarvinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [1/1] ACPI: battery: Remove redundant NULL initalizations | expand |
On Wed, Jul 31, 2024 at 11:54 AM Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> wrote: > > A local 'battery' variable is initialized to NULL on two occassions > where it is unconditionally rewritten later. Remove the unnecessary > initializations. > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > --- > drivers/acpi/battery.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c > index da3a879d638a..06e84d21ba3b 100644 > --- a/drivers/acpi/battery.c > +++ b/drivers/acpi/battery.c > @@ -1207,7 +1207,7 @@ static int acpi_battery_update_retry(struct acpi_battery *battery) > static int acpi_battery_add(struct acpi_device *device) > { > int result = 0; > - struct acpi_battery *battery = NULL; > + struct acpi_battery *battery; > > if (!device) > return -EINVAL; > @@ -1260,7 +1260,7 @@ static int acpi_battery_add(struct acpi_device *device) > > static void acpi_battery_remove(struct acpi_device *device) > { > - struct acpi_battery *battery = NULL; > + struct acpi_battery *battery; > > if (!device || !acpi_driver_data(device)) > return; > -- Applied as 6.12 material, thanks!
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index da3a879d638a..06e84d21ba3b 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -1207,7 +1207,7 @@ static int acpi_battery_update_retry(struct acpi_battery *battery) static int acpi_battery_add(struct acpi_device *device) { int result = 0; - struct acpi_battery *battery = NULL; + struct acpi_battery *battery; if (!device) return -EINVAL; @@ -1260,7 +1260,7 @@ static int acpi_battery_add(struct acpi_device *device) static void acpi_battery_remove(struct acpi_device *device) { - struct acpi_battery *battery = NULL; + struct acpi_battery *battery; if (!device || !acpi_driver_data(device)) return;
A local 'battery' variable is initialized to NULL on two occassions where it is unconditionally rewritten later. Remove the unnecessary initializations. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- drivers/acpi/battery.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)