fujitsu-laptop: remove unnecessary input_free_device calls

PATCH In review Axel Lin 3 participants 3 messages Jul 2, 2010 – Jul 4, 2010

Subsystems (2)

x86 platform drivers Fujitsu laptop extras

lore

Share & tools

lore

Axel Lin

author

2010-07-02 07:20 UTC #0 lore raw

PATCH v2 1/1 fujitsu-laptop: remove unnecessary input_free_device calls

input_free_device should only be used if input_register_device() was not called yet or if it failed.
This patch removes unnecessary input_free_device calls.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/platform/x86/fujitsu-laptop.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

drivers/platform/x86/fujitsu-laptop.c +2 -4

index e325aeb..4346d26 100644
@@ -725,6 +725,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
 
 err_unregister_input_dev:
 	input_unregister_device(input);
+	input = NULL;
 err_free_input_dev:
 	input_free_device(input);
 err_stop:

@@ -738,8 +739,6 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type)
 
 	input_unregister_device(input);
 
-	input_free_device(input);
-
 	fujitsu->acpi_handle = NULL;
 
 	return 0;

@@ -930,6 +929,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
 
 err_unregister_input_dev:
 	input_unregister_device(input);
+	input = NULL;
 err_free_input_dev:
 	input_free_device(input);
 err_free_fifo:

@@ -953,8 +953,6 @@ static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type)
 
 	input_unregister_device(input);
 
-	input_free_device(input);
-
 	kfifo_free(&fujitsu_hotkey->fifo);
 
 	fujitsu_hotkey->acpi_handle = NULL;

Signature · 1 line

1.5.4.3

Jonathan Woithe

Acked-by on v2 1/1

2010-07-02 07:36 UTC #1 lore raw

Re: [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device

Acked-by Jonathan Woithe <[email protected]>

Quoted 52 lines

input_free_device should only be used if input_register_device() was not called yet or if it failed.
This patch removes unnecessary input_free_device calls.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/platform/x86/fujitsu-laptop.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

drivers/platform/x86/fujitsu-laptop.c +2 -4

index e325aeb..4346d26 100644
@@ -725,6 +725,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
 
 err_unregister_input_dev:
 	input_unregister_device(input);
+	input = NULL;
 err_free_input_dev:
 	input_free_device(input);
 err_stop:

@@ -738,8 +739,6 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type)
 
 	input_unregister_device(input);
 
-	input_free_device(input);
-
 	fujitsu->acpi_handle = NULL;
 
 	return 0;

@@ -930,6 +929,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
 
 err_unregister_input_dev:
 	input_unregister_device(input);
+	input = NULL;
 err_free_input_dev:
 	input_free_device(input);
 err_free_fifo:

@@ -953,8 +953,6 @@ static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type)
 
 	input_unregister_device(input);
 
-	input_free_device(input);
-
 	kfifo_free(&fujitsu_hotkey->fifo);
 
 	fujitsu_hotkey->acpi_handle = NULL;

Signature · 1 line

1.5.4.3

Signature · 6 lines

* Jonathan Woithe    [email protected]                        *
*                    http://www.physics.adelaide.edu.au/~jwoithe            *
***-----------------------------------------------------------------------***
** "Time is an illusion; lunchtime doubly so"                              **
*  "...you wouldn't recognize a subtle plan if it painted itself purple and *
*   danced naked on a harpsichord singing 'subtle plans are here again'"    *

Dmitry Torokhov

Acked-by

2010-07-04 08:37 UTC #2 lore raw

Re: [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device

Quoted 1 line · Jonathan Woithe

Acked-by Jonathan Woithe <[email protected]>

Looks good to me too.

Acked-by Dmitry Torokhov <[email protected]>

Quoted 66 lines

Quoted 53 lines

input_free_device should only be used if input_register_device() was not called yet or if it failed.
This patch removes unnecessary input_free_device calls.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/platform/x86/fujitsu-laptop.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

drivers/platform/x86/fujitsu-laptop.c +2 -4

index e325aeb..4346d26 100644
@@ -725,6 +725,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
 
 err_unregister_input_dev:
 	input_unregister_device(input);
+	input = NULL;
 err_free_input_dev:
 	input_free_device(input);
 err_stop:

@@ -738,8 +739,6 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type)
 
 	input_unregister_device(input);
 
-	input_free_device(input);
-
 	fujitsu->acpi_handle = NULL;
 
 	return 0;

@@ -930,6 +929,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
 
 err_unregister_input_dev:
 	input_unregister_device(input);
+	input = NULL;
 err_free_input_dev:
 	input_free_device(input);
 err_free_fifo:

@@ -953,8 +953,6 @@ static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type)
 
 	input_unregister_device(input);
 
-	input_free_device(input);
-
 	kfifo_free(&fujitsu_hotkey->fifo);
 
 	fujitsu_hotkey->acpi_handle = NULL;

Signature · 1 line

1.5.4.3

Signature · 10 lines

* Jonathan Woithe    [email protected]                        *
*                    http://www.physics.adelaide.edu.au/~jwoithe            *
***-----------------------------------------------------------------------***
** "Time is an illusion; lunchtime doubly so"                              **
*  "...you wouldn't recognize a subtle plan if it painted itself purple and *
*   danced naked on a harpsichord singing 'subtle plans are here again'"    *
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Signature · 1 line

Dmitry