diff for duplicates of <45FE1D44.8000805@boichat.ch> diff --git a/a/1.txt b/N1/1.txt index 7e53bc2..48abc27 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -78,7 +78,7 @@ provides an accelerometer (Apple Sudden Motion Sensor), light sensors, temperature sensors, keyboard backlight control and fan control. Only Intel-based Apple's computers are supported (MacBook Pro, MacBook, MacMini). -Signed-off-by: Nicolas Boichat <nicolas at boichat.ch> +Signed-off-by: Nicolas Boichat <nicolas@boichat.ch> --- @@ -93,19 +93,19 @@ diff --git a/MAINTAINERS b/MAINTAINERS index 81bcc22..cbfdc3e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -367,6 +367,12 @@ L: linux-laptop at vger.kernel.org +@@ -367,6 +367,12 @@ L: linux-laptop@vger.kernel.org W: http://www.canb.auug.org.au/~sfr/ S: Supported +APPLE SMC DRIVER +P: Nicolas Boichat -+M: nicolas at boichat.ch -+L: mactel-linux-devel at lists.sourceforge.net ++M: nicolas@boichat.ch ++L: mactel-linux-devel@lists.sourceforge.net +S: Maintained + APPLETALK NETWORK LAYER P: Arnaldo Carvalho de Melo - M: acme at conectiva.com.br + M: acme@conectiva.com.br diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 6d105a1..25b72a4 100644 --- a/drivers/hwmon/Kconfig @@ -164,14 +164,14 @@ index 0000000..f596101 + * sensors, fan control, keyboard backlight control) used in Intel-based Apple + * computers. + * -+ * Copyright (C) 2007 Nicolas Boichat <nicolas at boichat.ch> ++ * Copyright (C) 2007 Nicolas Boichat <nicolas@boichat.ch> + * + * Based on hdaps.c driver: -+ * Copyright (C) 2005 Robert Love <rml at novell.com> -+ * Copyright (C) 2005 Jesper Juhl <jesper.juhl at gmail.com> ++ * Copyright (C) 2005 Robert Love <rml@novell.com> ++ * Copyright (C) 2005 Jesper Juhl <jesper.juhl@gmail.com> + * + * Fan control based on smcFanControl: -+ * Copyright (C) 2006 Hendrik Holtmann <holtmann at mac.com> ++ * Copyright (C) 2006 Hendrik Holtmann <holtmann@mac.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License v2 as published by the @@ -284,7 +284,7 @@ index 0000000..f596101 + val = val & APPLESMC_STATUS_MASK; + + for (i = 0; i < 10000; i++) { -+ if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) = val) ++ if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == val) + return 0; + udelay(10); + } @@ -410,7 +410,7 @@ index 0000000..f596101 + if (debug) printk(KERN_DEBUG "applesmc try %d\n", total); + if (!applesmc_read_key(MOTION_SENSOR_KEY, buffer, 2) && + (buffer[0] != 0x00 || buffer[1] != 0x00)) { -+ if (total = INIT_TIMEOUT_MSECS) { ++ if (total == INIT_TIMEOUT_MSECS) { + printk(KERN_DEBUG "applesmc: device has" + " already been initialized" + " (0x%02x, 0x%02x).\n", @@ -883,7 +883,8 @@ index 0000000..f596101 +static int applesmc_dmi_match(struct dmi_system_id *id) +{ + int i = 0; -+ struct dmi_match_data* dmi_data + (struct dmi_match_data*)id->driver_data; ++ struct dmi_match_data* dmi_data = ++ (struct dmi_match_data*)id->driver_data; + printk(KERN_INFO "applesmc: %s detected:\n", id->ident); + applesmc_accelerometer = dmi_data->accelerometer; + printk(KERN_INFO "applesmc: - Model %s accelerometer\n", diff --git a/a/content_digest b/N1/content_digest index 501ddac..4ef2095 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\045F7C083.7090504@boichat.ch\0" - "From\0nicolas@boichat.ch (Nicolas Boichat)\0" - "Subject\0[lm-sensors] [PATCH] Apple SMC driver (hardware monitoring and\0" - "Date\0Mon, 19 Mar 2007 05:19:00 +0000\0" + "From\0Nicolas Boichat <nicolas@boichat.ch>\0" + "Subject\0[PATCH] Apple SMC driver (hardware monitoring and control)\0" + "Date\0Mon, 19 Mar 2007 13:19:00 +0800\0" "To\0Nicolas Boichat <nicolas@boichat.ch>" " Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0linux-kernel@vger.kernel.org" @@ -90,7 +90,7 @@ "temperature sensors, keyboard backlight control and fan control. Only\n" "Intel-based Apple's computers are supported (MacBook Pro, MacBook, MacMini).\n" "\n" - "Signed-off-by: Nicolas Boichat <nicolas at boichat.ch>\n" + "Signed-off-by: Nicolas Boichat <nicolas@boichat.ch>\n" "\n" "\n" "---\n" @@ -105,19 +105,19 @@ "index 81bcc22..cbfdc3e 100644\n" "--- a/MAINTAINERS\n" "+++ b/MAINTAINERS\n" - "@@ -367,6 +367,12 @@ L:\tlinux-laptop at vger.kernel.org\n" + "@@ -367,6 +367,12 @@ L:\tlinux-laptop@vger.kernel.org\n" " W:\thttp://www.canb.auug.org.au/~sfr/\n" " S:\tSupported\n" " \n" "+APPLE SMC DRIVER\n" "+P:\tNicolas Boichat\n" - "+M:\tnicolas at boichat.ch\n" - "+L:\tmactel-linux-devel at lists.sourceforge.net\n" + "+M:\tnicolas@boichat.ch\n" + "+L:\tmactel-linux-devel@lists.sourceforge.net\n" "+S:\tMaintained\n" "+\n" " APPLETALK NETWORK LAYER\n" " P:\tArnaldo Carvalho de Melo\n" - " M:\tacme at conectiva.com.br\n" + " M:\tacme@conectiva.com.br\n" "diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig\n" "index 6d105a1..25b72a4 100644\n" "--- a/drivers/hwmon/Kconfig\n" @@ -176,14 +176,14 @@ "+ * sensors, fan control, keyboard backlight control) used in Intel-based Apple\n" "+ * computers.\n" "+ *\n" - "+ * Copyright (C) 2007 Nicolas Boichat <nicolas at boichat.ch>\n" + "+ * Copyright (C) 2007 Nicolas Boichat <nicolas@boichat.ch>\n" "+ *\n" "+ * Based on hdaps.c driver:\n" - "+ * Copyright (C) 2005 Robert Love <rml at novell.com>\n" - "+ * Copyright (C) 2005 Jesper Juhl <jesper.juhl at gmail.com>\n" + "+ * Copyright (C) 2005 Robert Love <rml@novell.com>\n" + "+ * Copyright (C) 2005 Jesper Juhl <jesper.juhl@gmail.com>\n" "+ *\n" "+ * Fan control based on smcFanControl:\n" - "+ * Copyright (C) 2006 Hendrik Holtmann <holtmann at mac.com>\n" + "+ * Copyright (C) 2006 Hendrik Holtmann <holtmann@mac.com>\n" "+ *\n" "+ * This program is free software; you can redistribute it and/or modify it\n" "+ * under the terms of the GNU General Public License v2 as published by the\n" @@ -296,7 +296,7 @@ "+\tval = val & APPLESMC_STATUS_MASK;\n" "+\n" "+\tfor (i = 0; i < 10000; i++) {\n" - "+\t\tif ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) = val)\n" + "+\t\tif ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == val)\n" "+\t\t\treturn 0;\n" "+\t\tudelay(10);\n" "+\t}\n" @@ -422,7 +422,7 @@ "+\t\tif (debug) printk(KERN_DEBUG \"applesmc try %d\\n\", total);\n" "+\t\tif (!applesmc_read_key(MOTION_SENSOR_KEY, buffer, 2) &&\n" "+\t\t\t\t(buffer[0] != 0x00 || buffer[1] != 0x00)) {\n" - "+\t\t\tif (total = INIT_TIMEOUT_MSECS) {\n" + "+\t\t\tif (total == INIT_TIMEOUT_MSECS) {\n" "+\t\t\t\tprintk(KERN_DEBUG \"applesmc: device has\" \n" "+\t\t\t\t\t\t\" already been initialized\"\n" "+\t\t\t\t\t\t\" (0x%02x, 0x%02x).\\n\",\n" @@ -895,7 +895,8 @@ "+static int applesmc_dmi_match(struct dmi_system_id *id)\n" "+{\n" "+\tint i = 0;\n" - "+\tstruct dmi_match_data* dmi_data +\t\t\t\t\t(struct dmi_match_data*)id->driver_data;\n" + "+\tstruct dmi_match_data* dmi_data =\n" + "+\t\t\t\t\t(struct dmi_match_data*)id->driver_data;\n" "+\tprintk(KERN_INFO \"applesmc: %s detected:\\n\", id->ident);\n" "+\tapplesmc_accelerometer = dmi_data->accelerometer;\n" "+\tprintk(KERN_INFO \"applesmc: - Model %s accelerometer\\n\",\n" @@ -1136,4 +1137,4 @@ "+MODULE_DESCRIPTION(\"Apple SMC\");\n" "+MODULE_LICENSE(\"GPL v2\");" -d3f80e439ba0bd30ae270f19e2895ec141d0c6fbef4df96cdffbb5f377de305e +9b9a98b0c68aea8ab0d26a50d12065c29f8c1f44dca70c77b600554dcf367a3a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.