* [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device calls
@ 2010-07-02 7:20 Axel Lin
2010-07-02 7:35 ` [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device Jonathan Woithe
0 siblings, 1 reply; 3+ messages in thread
From: Axel Lin @ 2010-07-02 7:20 UTC (permalink / raw)
To: linux-kernel
Cc: Jonathan Woithe, Matthew Garrett, Len Brown, Andrew Morton,
Stefani Seibold, Andi Kleen, platform-driver-x86
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 <axel.lin@gmail.com>
---
drivers/platform/x86/fujitsu-laptop.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index e325aeb..4346d26 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -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;
--
1.5.4.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device
2010-07-02 7:20 [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device calls Axel Lin
@ 2010-07-02 7:35 ` Jonathan Woithe
2010-07-04 8:37 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Woithe @ 2010-07-02 7:35 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Jonathan Woithe, Matthew Garrett, Len Brown,
Andrew Morton, Stefani Seibold, Andi Kleen, platform-driver-x86
Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
> 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 <axel.lin@gmail.com>
> ---
> drivers/platform/x86/fujitsu-laptop.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
> index e325aeb..4346d26 100644
> --- a/drivers/platform/x86/fujitsu-laptop.c
> +++ b/drivers/platform/x86/fujitsu-laptop.c
> @@ -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;
> --
> 1.5.4.3
>
>
>
--
* Jonathan Woithe jwoithe@physics.adelaide.edu.au *
* 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'" *
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device
2010-07-02 7:35 ` [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device Jonathan Woithe
@ 2010-07-04 8:37 ` Dmitry Torokhov
0 siblings, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2010-07-04 8:37 UTC (permalink / raw)
To: Jonathan Woithe
Cc: Axel Lin, linux-kernel, Matthew Garrett, Len Brown,
Andrew Morton, Stefani Seibold, Andi Kleen, platform-driver-x86
On Fri, Jul 02, 2010 at 05:05:02PM +0930, Jonathan Woithe wrote:
> Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
Looks good to me too.
Acked-by: Dmitry Torokhov <dtor@mail.ru>
>
> > 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 <axel.lin@gmail.com>
> > ---
> > drivers/platform/x86/fujitsu-laptop.c | 6 ++----
> > 1 files changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
> > index e325aeb..4346d26 100644
> > --- a/drivers/platform/x86/fujitsu-laptop.c
> > +++ b/drivers/platform/x86/fujitsu-laptop.c
> > @@ -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;
> > --
> > 1.5.4.3
> >
> >
> >
>
>
> --
> * Jonathan Woithe jwoithe@physics.adelaide.edu.au *
> * 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-04 8:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-02 7:20 [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device calls Axel Lin
2010-07-02 7:35 ` [PATCH v2] fujitsu-laptop: remove unnecessary input_free_device Jonathan Woithe
2010-07-04 8:37 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome