diff for duplicates of <45FF8976.4060406@boichat.ch> diff --git a/a/1.txt b/N1/1.txt index a1a3e82..d917346 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ Hello, Andrew Morton wrote: -> On Mon, 19 Mar 2007 13:19:00 +0800 Nicolas Boichat <nicolas at boichat.ch> wrote: +> On Mon, 19 Mar 2007 13:19:00 +0800 Nicolas Boichat <nicolas@boichat.ch> wrote: > > >> This driver provides support for the Apple System Management Controller, which @@ -216,7 +216,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> --- @@ -230,19 +230,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 @@ -301,14 +301,14 @@ index 0000000..4060667 + * 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 @@ -432,7 +432,7 @@ index 0000000..4060667 + 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); + } @@ -565,7 +565,7 @@ index 0000000..4060667 + 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", @@ -734,7 +734,8 @@ index 0000000..4060667 + u8 buffer[2]; + unsigned int temp; + struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); -+ const char* key + temperature_sensors_sets[applesmc_temperature_set][attr->index]; ++ const char* key = ++ temperature_sensors_sets[applesmc_temperature_set][attr->index]; + + mutex_lock(&applesmc_lock); + @@ -757,7 +758,8 @@ index 0000000..4060667 + unsigned int speed = 0; + char newkey[5]; + u8 buffer[2]; -+ struct sensor_device_attribute_2 *sensor_attr + to_sensor_dev_attr_2(attr); ++ struct sensor_device_attribute_2 *sensor_attr = ++ to_sensor_dev_attr_2(attr); + + newkey[0] = fan_speed_keys[sensor_attr->nr][0]; + newkey[1] = '0' + sensor_attr->index; @@ -785,7 +787,8 @@ index 0000000..4060667 + u32 speed; + char newkey[5]; + u8 buffer[2]; -+ struct sensor_device_attribute_2 *sensor_attr + to_sensor_dev_attr_2(attr); ++ struct sensor_device_attribute_2 *sensor_attr = ++ to_sensor_dev_attr_2(attr); + + speed = simple_strtoul(sysfsbuf, NULL, 10); + diff --git a/a/content_digest b/N1/content_digest index 936421e..260ad62 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\045F7C083.7090504@boichat.ch\0" "ref\045FE1D44.8000805@boichat.ch\0" "ref\020070318225430.3d704289.akpm@linux-foundation.org\0" - "From\0nicolas@boichat.ch (Nicolas Boichat)\0" - "Subject\0[lm-sensors] [PATCH] Apple SMC driver (hardware monitoring and\0" - "Date\0Tue, 20 Mar 2007 07:12:54 +0000\0" + "From\0Nicolas Boichat <nicolas@boichat.ch>\0" + "Subject\0Re: [PATCH] Apple SMC driver (hardware monitoring and control)\0" + "Date\0Tue, 20 Mar 2007 15:12:54 +0800\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0linux-kernel@vger.kernel.org" lm-sensors@lm-sensors.org @@ -14,7 +14,7 @@ "Hello,\n" "\n" "Andrew Morton wrote:\n" - "> On Mon, 19 Mar 2007 13:19:00 +0800 Nicolas Boichat <nicolas at boichat.ch> wrote:\n" + "> On Mon, 19 Mar 2007 13:19:00 +0800 Nicolas Boichat <nicolas@boichat.ch> wrote:\n" ">\n" "> \n" ">> This driver provides support for the Apple System Management Controller, which\n" @@ -229,7 +229,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" @@ -243,19 +243,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" @@ -314,14 +314,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" @@ -445,7 +445,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" @@ -578,7 +578,7 @@ "+\t\t\tprintk(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" @@ -747,7 +747,8 @@ "+\tu8 buffer[2];\n" "+\tunsigned int temp;\n" "+\tstruct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);\n" - "+\tconst char* key +\t\ttemperature_sensors_sets[applesmc_temperature_set][attr->index];\n" + "+\tconst char* key =\n" + "+\t\ttemperature_sensors_sets[applesmc_temperature_set][attr->index];\n" "+\t\n" "+\tmutex_lock(&applesmc_lock);\n" "+\n" @@ -770,7 +771,8 @@ "+\tunsigned int speed = 0;\n" "+\tchar newkey[5];\n" "+\tu8 buffer[2];\n" - "+\tstruct sensor_device_attribute_2 *sensor_attr +\t\t\t\t\t\tto_sensor_dev_attr_2(attr);\n" + "+\tstruct sensor_device_attribute_2 *sensor_attr =\n" + "+\t\t\t\t\t\tto_sensor_dev_attr_2(attr);\n" "+\n" "+\tnewkey[0] = fan_speed_keys[sensor_attr->nr][0];\n" "+\tnewkey[1] = '0' + sensor_attr->index;\n" @@ -798,7 +800,8 @@ "+\tu32 speed;\n" "+\tchar newkey[5];\n" "+\tu8 buffer[2];\n" - "+\tstruct sensor_device_attribute_2 *sensor_attr +\t\t\t\t\t\tto_sensor_dev_attr_2(attr);\n" + "+\tstruct sensor_device_attribute_2 *sensor_attr =\n" + "+\t\t\t\t\t\tto_sensor_dev_attr_2(attr);\n" "+\n" "+\tspeed = simple_strtoul(sysfsbuf, NULL, 10);\n" "+\n" @@ -1224,4 +1227,4 @@ "+MODULE_DESCRIPTION(\"Apple SMC\");\n" "+MODULE_LICENSE(\"GPL v2\");" -8acbf60a8e66328ca8a55e63bf28d3e694b9f3979ecf07f327e71806df96271b +0799773a6d05adc1d43052d9f59f8741e1d275ff603d50a4ba160e4716f17404
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.