From: Dmitry Torokhov <dtor_core@ameritech.net>
To: Kenan Esau <kenan.esau@conan.de>
Cc: harald.hoyer@redhat.de, linux-input@atrey.karlin.mff.cuni.cz,
linux-kernel@vger.kernel.org, Vojtech Pavlik <vojtech@suse.cz>
Subject: [PATCH 1/4] Lifebook: dmi on x86 only
Date: Tue, 22 Mar 2005 02:14:55 -0500 [thread overview]
Message-ID: <200503220214.55379.dtor_core@ameritech.net> (raw)
In-Reply-To: <200503220213.46375.dtor_core@ameritech.net>
===================================================================
Input: lifebook - DMI facility is only available on i386, do not
attempt to compile on anything else.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
lifebook.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
Index: dtor/drivers/input/mouse/lifebook.c
===================================================================
--- dtor.orig/drivers/input/mouse/lifebook.c
+++ dtor/drivers/input/mouse/lifebook.c
@@ -15,17 +15,17 @@
#include <linux/input.h>
#include <linux/serio.h>
#include <linux/libps2.h>
-#include <linux/dmi.h>
#include "psmouse.h"
#include "lifebook.h"
static int max_y = 1024;
-
+#if defined(__i386__)
+#include <linux/dmi.h>
static struct dmi_system_id lifebook_dmi_table[] = {
{
- .ident = "Fujitsu Siemens Lifebook B-Sereis",
+ .ident = "Lifebook",
.matches = {
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),
},
@@ -33,6 +33,13 @@ static struct dmi_system_id lifebook_dmi
{ }
};
+static inline int lifebook_check_dmi(void)
+{
+ return dmi_check_system(lifebook_dmi_table) ? 0 : -1;
+}
+#else
+static inline int lifebook_check_dmi(void) { return -1; }
+#endif
static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
{
@@ -102,8 +109,7 @@ static void lifebook_disconnect(struct p
int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto,
int set_properties)
{
- if (!dmi_check_system(lifebook_dmi_table) &&
- (max_proto != PSMOUSE_LIFEBOOK) )
+ if (lifebook_check_dmi() && max_proto != PSMOUSE_LIFEBOOK)
return -1;
if (set_properties) {
next prev parent reply other threads:[~2005-03-22 7:18 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-11 20:10 [rfc/rft] Fujitsu B-Series Lifebook PS/2 TouchScreen driver Vojtech Pavlik
2005-02-12 17:01 ` Kenan Esau
2005-02-12 17:46 ` Arjan van de Ven
2005-02-13 9:39 ` Kenan Esau
2005-02-13 11:46 ` Vojtech Pavlik
2005-02-12 18:17 ` Dmitry Torokhov
2005-02-12 18:34 ` Vojtech Pavlik
2005-02-13 10:05 ` Kenan Esau
2005-02-13 12:01 ` Vojtech Pavlik
2005-02-13 18:14 ` Kenan Esau
2005-02-13 19:02 ` Vojtech Pavlik
[not found] ` <200502130149.11183.dtor_core@ameritech.net>
2005-02-13 8:36 ` Vojtech Pavlik
2005-02-14 10:06 ` Harald Hoyer
2005-02-15 8:57 ` Kenan Esau
2005-02-15 13:43 ` Vojtech Pavlik
2005-02-15 14:43 ` Dmitry Torokhov
2005-02-15 17:03 ` Kenan Esau
2005-02-15 17:09 ` Vojtech Pavlik
2005-02-15 17:42 ` Dmitry Torokhov
2005-02-15 17:15 ` Kenan Esau
2005-02-16 18:34 ` Kenan Esau
2005-02-16 21:35 ` Vojtech Pavlik
2005-02-17 14:19 ` Kenan Esau
2005-02-17 15:04 ` Vojtech Pavlik
2005-02-17 19:42 ` Vojtech Pavlik
2005-02-19 12:54 ` Kenan Esau
2005-02-19 13:16 ` Vojtech Pavlik
2005-02-21 8:06 ` Kenan Esau
2005-02-24 9:03 ` Vojtech Pavlik
2005-03-01 8:11 ` Kenan Esau
2005-03-01 12:08 ` Vojtech Pavlik
2005-03-07 7:27 ` Kenan Esau
2005-03-07 7:34 ` Vojtech Pavlik
2005-03-15 13:25 ` Kenan Esau
2005-03-21 12:44 ` Vojtech Pavlik
2005-03-21 14:52 ` Dmitry Torokhov
2005-03-21 15:31 ` Kenan Esau
2005-03-21 15:44 ` Dmitry Torokhov
2005-03-22 7:13 ` Dmitry Torokhov
2005-03-22 7:14 ` Dmitry Torokhov [this message]
2005-03-22 7:15 ` [PATCH 2/4] Lifebook: various cleanups Dmitry Torokhov
2005-03-22 7:16 ` [PATCH 3/4] Lifebook: rearrange init code Dmitry Torokhov
2005-03-22 7:17 ` [PATCH 4/4] psmouse: dynamic protocol switching via sysfs Dmitry Torokhov
2005-04-03 19:49 ` Kenan Esau
2005-04-04 5:45 ` Dmitry Torokhov
2005-04-04 6:48 ` Kenan Esau
2005-03-22 7:29 ` [PATCH 1/4] Lifebook: dmi on x86 only Dave Jones
2005-03-22 7:33 ` Dmitry Torokhov
2005-03-22 14:01 ` Alan Cox
2005-03-22 10:01 ` [rfc/rft] Fujitsu B-Series Lifebook PS/2 TouchScreen driver Andrey Panin
2005-03-22 14:20 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200503220214.55379.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=harald.hoyer@redhat.de \
--cc=kenan.esau@conan.de \
--cc=linux-input@atrey.karlin.mff.cuni.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=vojtech@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox