* [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return 1 instead of 0
@ 2010-07-02 9:04 Axel Lin
2010-07-05 7:12 ` [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb Jonathan Woithe
2010-07-06 4:28 ` Jonathan Woithe
0 siblings, 2 replies; 4+ messages in thread
From: Axel Lin @ 2010-07-02 9:04 UTC (permalink / raw)
To: linux-kernel
Cc: Cezary Jackiewicz, Matthew Garrett, Tim Gardner,
Mario Limonciello, Richard Purdie, Michal Marek, Jonathan Woithe,
Len Brown, Andrew Morton, Stefani Seibold, Andi Kleen,
Lennart Poettering, Lee, Chun-Yi, platform-driver-x86
dmi_check_system() walks the table running matching functions until someone
returns non zero or we hit the end.
This patch makes dmi_check_cb to return 1 so dmi_check_system() return
immediately when a match is found.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/platform/x86/compal-laptop.c | 2 +-
drivers/platform/x86/fujitsu-laptop.c | 6 +++---
drivers/platform/x86/msi-laptop.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index 71ff154..dc31a08 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -190,7 +190,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
printk(KERN_INFO "compal-laptop: Identified laptop model '%s'.\n",
id->ident);
- return 0;
+ return 1;
}
static struct dmi_system_id __initdata compal_dmi_table[] = {
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index dab1a0e..1859d7f 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -603,7 +603,7 @@ static int dmi_check_cb_s6410(const struct dmi_system_id *id)
dmi_check_cb_common(id);
fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
- return 0;
+ return 1;
}
static int dmi_check_cb_s6420(const struct dmi_system_id *id)
@@ -611,7 +611,7 @@ static int dmi_check_cb_s6420(const struct dmi_system_id *id)
dmi_check_cb_common(id);
fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
- return 0;
+ return 1;
}
static int dmi_check_cb_p8010(const struct dmi_system_id *id)
@@ -620,7 +620,7 @@ static int dmi_check_cb_p8010(const struct dmi_system_id *id)
fujitsu->keycode1 = KEY_HELP; /* "Support" */
fujitsu->keycode3 = KEY_SWITCHVIDEOMODE; /* "Presentation" */
fujitsu->keycode4 = KEY_WWW; /* "Internet" */
- return 0;
+ return 1;
}
static struct dmi_system_id fujitsu_dmi_table[] = {
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index afd762b..c67a74c 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -434,7 +434,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
{
printk(KERN_INFO "msi-laptop: Identified laptop model '%s'.\n",
id->ident);
- return 0;
+ return 1;
}
static struct dmi_system_id __initdata msi_dmi_table[] = {
--
1.5.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb
2010-07-02 9:04 [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return 1 instead of 0 Axel Lin
@ 2010-07-05 7:12 ` Jonathan Woithe
2010-07-06 2:09 ` Axel Lin
2010-07-06 4:28 ` Jonathan Woithe
1 sibling, 1 reply; 4+ messages in thread
From: Jonathan Woithe @ 2010-07-05 7:12 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Cezary Jackiewicz, Matthew Garrett, Tim Gardner,
Mario Limonciello, Richard Purdie, Michal Marek, Jonathan Woithe,
Len Brown, Andrew Morton, Stefani Seibold, Andi Kleen,
Lennart Poettering, Lee Chun-Yi, platform-driver-x86
Is there no possibility of some other matching function existing after ours
in the tree which might need to also be called? If so, this change would
prevent that.
Regards
jonathan
> dmi_check_system() walks the table running matching functions until someone
> returns non zero or we hit the end.
>
> This patch makes dmi_check_cb to return 1 so dmi_check_system() return
> immediately when a match is found.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/platform/x86/compal-laptop.c | 2 +-
> drivers/platform/x86/fujitsu-laptop.c | 6 +++---
> drivers/platform/x86/msi-laptop.c | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
> index 71ff154..dc31a08 100644
> --- a/drivers/platform/x86/compal-laptop.c
> +++ b/drivers/platform/x86/compal-laptop.c
> @@ -190,7 +190,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
> printk(KERN_INFO "compal-laptop: Identified laptop model '%s'.\n",
> id->ident);
>
> - return 0;
> + return 1;
> }
>
> static struct dmi_system_id __initdata compal_dmi_table[] = {
> diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
> index dab1a0e..1859d7f 100644
> --- a/drivers/platform/x86/fujitsu-laptop.c
> +++ b/drivers/platform/x86/fujitsu-laptop.c
> @@ -603,7 +603,7 @@ static int dmi_check_cb_s6410(const struct dmi_system_id *id)
> dmi_check_cb_common(id);
> fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
> fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
> - return 0;
> + return 1;
> }
>
> static int dmi_check_cb_s6420(const struct dmi_system_id *id)
> @@ -611,7 +611,7 @@ static int dmi_check_cb_s6420(const struct dmi_system_id *id)
> dmi_check_cb_common(id);
> fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
> fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
> - return 0;
> + return 1;
> }
>
> static int dmi_check_cb_p8010(const struct dmi_system_id *id)
> @@ -620,7 +620,7 @@ static int dmi_check_cb_p8010(const struct dmi_system_id *id)
> fujitsu->keycode1 = KEY_HELP; /* "Support" */
> fujitsu->keycode3 = KEY_SWITCHVIDEOMODE; /* "Presentation" */
> fujitsu->keycode4 = KEY_WWW; /* "Internet" */
> - return 0;
> + return 1;
> }
>
> static struct dmi_system_id fujitsu_dmi_table[] = {
> diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
> index afd762b..c67a74c 100644
> --- a/drivers/platform/x86/msi-laptop.c
> +++ b/drivers/platform/x86/msi-laptop.c
> @@ -434,7 +434,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
> {
> printk(KERN_INFO "msi-laptop: Identified laptop model '%s'.\n",
> id->ident);
> - return 0;
> + return 1;
> }
>
> static struct dmi_system_id __initdata msi_dmi_table[] = {
> --
> 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] 4+ messages in thread* Re: [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb
2010-07-05 7:12 ` [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb Jonathan Woithe
@ 2010-07-06 2:09 ` Axel Lin
0 siblings, 0 replies; 4+ messages in thread
From: Axel Lin @ 2010-07-06 2:09 UTC (permalink / raw)
To: Jonathan Woithe
Cc: linux-kernel, Cezary Jackiewicz, Matthew Garrett, Tim Gardner,
Mario Limonciello, Richard Purdie, Michal Marek, Len Brown,
Andrew Morton, Stefani Seibold, Andi Kleen, Lennart Poettering,
Lee Chun-Yi, platform-driver-x86
2010/7/5 Jonathan Woithe <jwoithe@physics.adelaide.edu.au>:
> Is there no possibility of some other matching function existing after ours
> in the tree which might need to also be called? If so, this change would
> prevent that.
hi Jonathan,
I checked the implementation of dmi_check_system() and the useage cases in
compal-laptop/fujitsu-laptop/msi-laptop, it should be no problem with
this change.
In compal-laptop and msi-laptop, we call dmi_check_system() to
identify the laptop model.
(The callback simply print the identified laptop model)
It should have zero or exactly one successful match.
In fujitsu-laptop, we call dmi_check_system() to identify the laptop
model and set parameters accordingly.
The callback print the identified laptop model and set parameters
(use_alt_lcd_levels / fujitsu->keycode[1|2|3|4|5] ).
It should have zero or exactly one successful match.
If it has some other matching function with successful match, then
current implementation
is buggy anyway because new successful matches will override the
fujitsu->keycode[1|2|3|4|5]
parameters.
Regards,
Axel
>
> Regards
> jonathan
>
>> dmi_check_system() walks the table running matching functions until someone
>> returns non zero or we hit the end.
>>
>> This patch makes dmi_check_cb to return 1 so dmi_check_system() return
>> immediately when a match is found.
>>
>> Signed-off-by: Axel Lin <axel.lin@gmail.com>
>> ---
>> drivers/platform/x86/compal-laptop.c | 2 +-
>> drivers/platform/x86/fujitsu-laptop.c | 6 +++---
>> drivers/platform/x86/msi-laptop.c | 2 +-
>> 3 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
>> index 71ff154..dc31a08 100644
>> --- a/drivers/platform/x86/compal-laptop.c
>> +++ b/drivers/platform/x86/compal-laptop.c
>> @@ -190,7 +190,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
>> printk(KERN_INFO "compal-laptop: Identified laptop model '%s'.\n",
>> id->ident);
>>
>> - return 0;
>> + return 1;
>> }
>>
>> static struct dmi_system_id __initdata compal_dmi_table[] = {
>> diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
>> index dab1a0e..1859d7f 100644
>> --- a/drivers/platform/x86/fujitsu-laptop.c
>> +++ b/drivers/platform/x86/fujitsu-laptop.c
>> @@ -603,7 +603,7 @@ static int dmi_check_cb_s6410(const struct dmi_system_id *id)
>> dmi_check_cb_common(id);
>> fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
>> fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
>> - return 0;
>> + return 1;
>> }
>>
>> static int dmi_check_cb_s6420(const struct dmi_system_id *id)
>> @@ -611,7 +611,7 @@ static int dmi_check_cb_s6420(const struct dmi_system_id *id)
>> dmi_check_cb_common(id);
>> fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
>> fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
>> - return 0;
>> + return 1;
>> }
>>
>> static int dmi_check_cb_p8010(const struct dmi_system_id *id)
>> @@ -620,7 +620,7 @@ static int dmi_check_cb_p8010(const struct dmi_system_id *id)
>> fujitsu->keycode1 = KEY_HELP; /* "Support" */
>> fujitsu->keycode3 = KEY_SWITCHVIDEOMODE; /* "Presentation" */
>> fujitsu->keycode4 = KEY_WWW; /* "Internet" */
>> - return 0;
>> + return 1;
>> }
>>
>> static struct dmi_system_id fujitsu_dmi_table[] = {
>> diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
>> index afd762b..c67a74c 100644
>> --- a/drivers/platform/x86/msi-laptop.c
>> +++ b/drivers/platform/x86/msi-laptop.c
>> @@ -434,7 +434,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
>> {
>> printk(KERN_INFO "msi-laptop: Identified laptop model '%s'.\n",
>> id->ident);
>> - return 0;
>> + return 1;
>> }
>>
>> static struct dmi_system_id __initdata msi_dmi_table[] = {
>> --
>> 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] 4+ messages in thread
* Re: [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb
2010-07-02 9:04 [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return 1 instead of 0 Axel Lin
2010-07-05 7:12 ` [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb Jonathan Woithe
@ 2010-07-06 4:28 ` Jonathan Woithe
1 sibling, 0 replies; 4+ messages in thread
From: Jonathan Woithe @ 2010-07-06 4:28 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Cezary Jackiewicz, Matthew Garrett, Tim Gardner,
Mario Limonciello, Richard Purdie, Michal Marek, Jonathan Woithe,
Len Brown, Andrew Morton, Stefani Seibold, Andi Kleen,
Lennart Poettering, Lee Chun-Yi, platform-driver-x86
Hi Axel
> 2010/7/5 Jonathan Woithe <jwoithe@physics.adelaide.edu.au>:
> > Is there no possibility of some other matching function existing after ours
> > in the tree which might need to also be called? If so, this change would
> > prevent that.
>
> I checked the implementation of dmi_check_system() and the useage cases in
> compal-laptop/fujitsu-laptop/msi-laptop, it should be no problem with
> this change.
>
> In compal-laptop and msi-laptop, we call dmi_check_system() to
> identify the laptop model.
> (The callback simply print the identified laptop model)
> It should have zero or exactly one successful match.
>
> In fujitsu-laptop, we call dmi_check_system() to identify the laptop
> model and set parameters accordingly.
> The callback print the identified laptop model and set parameters
> (use_alt_lcd_levels / fujitsu->keycode[1|2|3|4|5] ).
> It should have zero or exactly one successful match.
Yes, that seems to be the situation. If that is the case then I'm happy
with the fujitsu-laptop component of this patch (I can't speak for the
maintainers of the other drivers touched by this patch).
Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
Regards
jonathan
> dmi_check_system() walks the table running matching functions until someone
> returns non zero or we hit the end.
>
> This patch makes dmi_check_cb to return 1 so dmi_check_system() return
> immediately when a match is found.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/platform/x86/compal-laptop.c | 2 +-
> drivers/platform/x86/fujitsu-laptop.c | 6 +++---
> drivers/platform/x86/msi-laptop.c | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
> index 71ff154..dc31a08 100644
> --- a/drivers/platform/x86/compal-laptop.c
> +++ b/drivers/platform/x86/compal-laptop.c
> @@ -190,7 +190,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
> printk(KERN_INFO "compal-laptop: Identified laptop model '%s'.\n",
> id->ident);
>
> - return 0;
> + return 1;
> }
>
> static struct dmi_system_id __initdata compal_dmi_table[] = {
> diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
> index dab1a0e..1859d7f 100644
> --- a/drivers/platform/x86/fujitsu-laptop.c
> +++ b/drivers/platform/x86/fujitsu-laptop.c
> @@ -603,7 +603,7 @@ static int dmi_check_cb_s6410(const struct dmi_system_id *id)
> dmi_check_cb_common(id);
> fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
> fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
> - return 0;
> + return 1;
> }
>
> static int dmi_check_cb_s6420(const struct dmi_system_id *id)
> @@ -611,7 +611,7 @@ static int dmi_check_cb_s6420(const struct dmi_system_id *id)
> dmi_check_cb_common(id);
> fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
> fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
> - return 0;
> + return 1;
> }
>
> static int dmi_check_cb_p8010(const struct dmi_system_id *id)
> @@ -620,7 +620,7 @@ static int dmi_check_cb_p8010(const struct dmi_system_id *id)
> fujitsu->keycode1 = KEY_HELP; /* "Support" */
> fujitsu->keycode3 = KEY_SWITCHVIDEOMODE; /* "Presentation" */
> fujitsu->keycode4 = KEY_WWW; /* "Internet" */
> - return 0;
> + return 1;
> }
>
> static struct dmi_system_id fujitsu_dmi_table[] = {
> diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
> index afd762b..c67a74c 100644
> --- a/drivers/platform/x86/msi-laptop.c
> +++ b/drivers/platform/x86/msi-laptop.c
> @@ -434,7 +434,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
> {
> printk(KERN_INFO "msi-laptop: Identified laptop model '%s'.\n",
> id->ident);
> - return 0;
> + return 1;
> }
>
> static struct dmi_system_id __initdata msi_dmi_table[] = {
> --
> 1.5.4.3
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-06 4:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-02 9:04 [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return 1 instead of 0 Axel Lin
2010-07-05 7:12 ` [PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb Jonathan Woithe
2010-07-06 2:09 ` Axel Lin
2010-07-06 4:28 ` Jonathan Woithe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).