9 files changed, 80 insertions, 138 deletions

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 98821f97583c..b97aebd7aeb8 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -2071,12 +2071,13 @@ module_init(rs_init)
 module_exit(rs_exit)
 
 
+#if defined(CONFIG_SERIAL_CONSOLE) && !defined(MODULE)
+
 /*
  * ------------------------------------------------------------
  * Serial console driver
  * ------------------------------------------------------------
  */
-#ifdef CONFIG_SERIAL_CONSOLE
 
 static void amiga_serial_putc(char c)
 {
@@ -2130,6 +2131,7 @@ static int __init amiserial_console_init(void)
         return 0;
 }
 console_initcall(amiserial_console_init);
-#endif
+
+#endif /* CONFIG_SERIAL_CONSOLE && !MODULE */
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index d9e7a49d6cbf..70bb854086df 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -178,7 +178,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "+3.3V",              10, 0, 20, 1, 0 },
                 { "5VSB",               11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                 { "PWM",                26, 1, 1, 1, 0 },
                 { "CPU Fan",            32, 2, 60, 1, 0 },
                 { "NB Fan",             33, 2, 60, 1, 0 },
@@ -200,7 +200,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "+3.3V",              10, 0, 20, 1, 0 },
                 { "5VSB",               11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                 { "PWM1",               26, 1, 1, 1, 0 },
                 { "PWM2",               27, 1, 1, 1, 0 },
                 { "PWM3",               28, 1, 1, 1, 0 },
@@ -229,7 +229,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "+3.3V",              10, 0, 20, 1, 0 },
                 { "5VSB",               11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                 { "PWM",                26, 1, 1, 1, 0 },
                 { "CPU Fan",            32, 2, 60, 1, 0 },
                 { "NB Fan",             33, 2, 60, 1, 0 },
@@ -250,7 +250,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "+3.3V",              10, 0, 20, 1, 0 },
                 { "5VSB",               11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                 { "PWM",                26, 1, 1, 1, 0 },
                 { "CPU Fan",            32, 2, 60, 1, 0 },
                 { "NB Fan",             33, 2, 60, 1, 0 },
@@ -342,7 +342,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "+3.3V",              10, 0, 20, 1, 0 },
                 { "5VSB",               11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                 { "PWM1",               26, 1, 1, 1, 0 },
                 { "PWM2",               27, 1, 1, 1, 0 },
                 { "PWM3",               28, 1, 1, 1, 0 },
@@ -371,7 +371,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "+3.3V",              10, 0, 20, 1, 0 },
                 { "5VSB",               11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                 { "PWM",                26, 1, 1, 1, 0 },
                 { "CPU Fan",            32, 2, 60, 1, 0 },
                 { "NB Fan",             33, 2, 60, 1, 0 },
@@ -402,7 +402,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX3 Fan",           36, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0016, NULL /* AW9D-MAX, need DMI string */, {
+        { 0x0016, "AW9D-MAX       (Intel i975-ICH7)", {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR2",                1, 0, 20, 1, 0 },
                 { "DDR2 VTT",            2, 0, 10, 1, 0 },
@@ -416,7 +416,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "+3.3V",              10, 0, 20, 1, 0 },
                 { "5VSB",               11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                 { "PWM1",               26, 1, 1, 1, 0 },
                 { "PWM2",               27, 1, 1, 1, 0 },
                 { "PWM3",               28, 1, 1, 1, 0 },
@@ -446,7 +446,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "ATX +3.3V",          10, 0, 20, 1, 0 },
                 { "ATX 5VSB",           11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            26, 1, 1, 1, 0 },
+                { "System",             26, 1, 1, 1, 0 },
                 { "PWM",                27, 1, 1, 1, 0 },
                 { "CPU FAN",            32, 2, 60, 1, 0 },
                 { "SYS FAN",            34, 2, 60, 1, 0 },
@@ -469,7 +469,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "+3.3V",              10, 0, 20, 1, 0 },
                 { "5VSB",               11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                 { "PWM Phase1",         26, 1, 1, 1, 0 },
                 { "PWM Phase2",         27, 1, 1, 1, 0 },
                 { "PWM Phase3",         28, 1, 1, 1, 0 },
@@ -487,7 +487,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "DDR2",               13, 0, 20, 1, 0 },
                 { "DDR2 VTT",           14, 0, 10, 1, 0 },
                 { "CPU VTT",             3, 0, 20, 1, 0 },
-                { "NB 1.2V ",            4, 0, 10, 1, 0 },
+                { "NB 1.2V",             4, 0, 10, 1, 0 },
                 { "SB 1.5V",             6, 0, 10, 1, 0 },
                 { "HyperTransport",      5, 0, 10, 1, 0 },
                 { "ATX +12V (24-Pin)",  12, 0, 60, 1, 0 },
@@ -496,7 +496,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "ATX +3.3V",          10, 0, 20, 1, 0 },
                 { "ATX 5VSB",           11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
                 { "PWM Phase1",         26, 1, 1, 1, 0 },
                 { "PWM Phase2",         27, 1, 1, 1, 0 },
                 { "PWM Phase3",         28, 1, 1, 1, 0 },
@@ -523,8 +523,8 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "+3.3V",              10, 0, 20, 1, 0 },
                 { "5VSB",               11, 0, 30, 1, 0 },
                 { "CPU",                24, 1, 1, 1, 0 },
-                { "System ",            25, 1, 1, 1, 0 },
-                { "PWM ",               26, 1, 1, 1, 0 },
+                { "System",             25, 1, 1, 1, 0 },
+                { "PWM",                26, 1, 1, 1, 0 },
                 { "PWM Phase2",         27, 1, 1, 1, 0 },
                 { "PWM Phase3",         28, 1, 1, 1, 0 },
                 { "PWM Phase4",         29, 1, 1, 1, 0 },
@@ -947,7 +947,7 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)
         if (!abituguru3_motherboards[i].dmi_name) {
                 printk(KERN_WARNING ABIT_UGURU3_NAME ": this motherboard was "
                         "not detected using DMI. Please send the output of "
-                        "\"dmidecode\" to the abituguru3 maintainer"
+                        "\"dmidecode\" to the abituguru3 maintainer "
                         "(see MAINTAINERS)\n");
         }
 #endif
diff --git a/drivers/hwmon/adt7473.c b/drivers/hwmon/adt7473.c
index 3a0b63136479..b9a8ea30c99c 100644
--- a/drivers/hwmon/adt7473.c
+++ b/drivers/hwmon/adt7473.c
@@ -319,35 +319,24 @@ out:
 }
 
 /*
- * On this chip, voltages are given as a count of steps between a minimum
- * and maximum voltage, not a direct voltage.
+ * Conversions
  */
-static const int volt_convert_table[][2] = {
-        {2997, 3},
-        {4395, 4},
+
+/* IN are scaled acording to built-in resistors */
+static const int adt7473_scaling[] = {  /* .001 Volts */
+        2250, 3300
 };
+#define SCALE(val, from, to)    (((val) * (to) + ((from) / 2)) / (from))
 
 static int decode_volt(int volt_index, u8 raw)
 {
-        int cmax = volt_convert_table[volt_index][0];
-        int cmin = volt_convert_table[volt_index][1];
-        return ((raw * (cmax - cmin)) / 255) + cmin;
+        return SCALE(raw, 192, adt7473_scaling[volt_index]);
 }
 
 static u8 encode_volt(int volt_index, int cooked)
 {
-        int cmax = volt_convert_table[volt_index][0];
-        int cmin = volt_convert_table[volt_index][1];
-        u8 x;
-
-        if (cooked > cmax)
-                cooked = cmax;
-        else if (cooked < cmin)
-                cooked = cmin;
-
-        x = ((cooked - cmin) * 255) / (cmax - cmin);
-
-        return x;
+        int raw = SCALE(cooked, adt7473_scaling[volt_index], 192);
+        return SENSORS_LIMIT(raw, 0, 255);
 }
 
 static ssize_t show_volt_min(struct device *dev,
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
index c54eff92be4a..bfc296145bba 100644
--- a/drivers/hwmon/hwmon-vid.c
+++ b/drivers/hwmon/hwmon-vid.c
@@ -180,6 +180,7 @@ static struct vrm_model vrm_models[] = {
         {X86_VENDOR_AMD, 0x6, ANY, ANY, 90},            /* Athlon Duron etc */
         {X86_VENDOR_AMD, 0xF, 0x3F, ANY, 24},           /* Athlon 64, Opteron */
         {X86_VENDOR_AMD, 0xF, ANY, ANY, 25},            /* NPT family 0Fh */
+        {X86_VENDOR_AMD, 0x10, ANY, ANY, 25},           /* NPT family 10h */
         {X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13},          /* Pentium M (130 nm) */
         {X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85},          /* Tualatin */
         {X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13},          /* Pentium M (90 nm) */
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 3edeebc0b835..96a701866726 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -12,9 +12,9 @@
  * made by National Semiconductor. Both have an increased remote
  * temperature measurement accuracy (1 degree), and the LM99
  * additionally shifts remote temperatures (measured and limits) by 16
- * degrees, which allows for higher temperatures measurement. The
- * driver doesn't handle it since it can be done easily in user-space.
+ * degrees, which allows for higher temperatures measurement.
  * Note that there is no way to differentiate between both chips.
+ * When device is auto-detected, the driver will assume an LM99.
  *
  * This driver also supports the LM86, another sensor chip made by
  * National Semiconductor. It is exactly similar to the LM90 except it
@@ -169,8 +169,8 @@ static const struct i2c_device_id lm90_id[] = {
         { "adt7461", adt7461 },
         { "lm90", lm90 },
         { "lm86", lm86 },
-        { "lm89", lm99 },
-        { "lm99", lm99 },       /* Missing temperature offset */
+        { "lm89", lm86 },
+        { "lm99", lm99 },
         { "max6646", max6646 },
         { "max6647", max6646 },
         { "max6649", max6646 },
@@ -366,6 +366,10 @@ static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr,
         else
                 temp = temp_from_s8(data->temp8[attr->index]);
 
+        /* +16 degrees offset for temp2 for the LM99 */
+        if (data->kind == lm99 && attr->index == 3)
+                temp += 16000;
+
         return sprintf(buf, "%d\n", temp);
 }
 
@@ -385,6 +389,10 @@ static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr,
         long val = simple_strtol(buf, NULL, 10);
         int nr = attr->index;
 
+        /* +16 degrees offset for temp2 for the LM99 */
+        if (data->kind == lm99 && attr->index == 3)
+                val -= 16000;
+
         mutex_lock(&data->update_lock);
         if (data->kind == adt7461)
                 data->temp8[nr] = temp_to_u8_adt7461(data, val);
@@ -411,6 +419,10 @@ static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr,
         else
                 temp = temp_from_s16(data->temp11[attr->index]);
 
+        /* +16 degrees offset for temp2 for the LM99 */
+        if (data->kind == lm99 &&  attr->index <= 2)
+                temp += 16000;
+
         return sprintf(buf, "%d\n", temp);
 }
 
@@ -432,6 +444,10 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
         long val = simple_strtol(buf, NULL, 10);
         int nr = attr->index;
 
+        /* +16 degrees offset for temp2 for the LM99 */
+        if (data->kind == lm99 && attr->index <= 2)
+                val -= 16000;
+
         mutex_lock(&data->update_lock);
         if (data->kind == adt7461)
                 data->temp11[nr] = temp_to_u16_adt7461(data, val);
@@ -461,9 +477,15 @@ static ssize_t show_temphyst(struct device *dev, struct device_attribute *devatt
 
         if (data->kind == adt7461)
                 temp = temp_from_u8_adt7461(data, data->temp8[attr->index]);
+        else if (data->kind == max6646)
+                temp = temp_from_u8(data->temp8[attr->index]);
         else
                 temp = temp_from_s8(data->temp8[attr->index]);
 
+        /* +16 degrees offset for temp2 for the LM99 */
+        if (data->kind == lm99 && attr->index == 3)
+                temp += 16000;
+
         return sprintf(buf, "%d\n", temp - temp_from_s8(data->temp_hyst));
 }
 
@@ -473,12 +495,19 @@ static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,
         struct i2c_client *client = to_i2c_client(dev);
         struct lm90_data *data = i2c_get_clientdata(client);
         long val = simple_strtol(buf, NULL, 10);
-        long hyst;
+        int temp;
 
         mutex_lock(&data->update_lock);
-        hyst = temp_from_s8(data->temp8[2]) - val;
+        if (data->kind == adt7461)
+                temp = temp_from_u8_adt7461(data, data->temp8[2]);
+        else if (data->kind == max6646)
+                temp = temp_from_u8(data->temp8[2]);
+        else
+                temp = temp_from_s8(data->temp8[2]);
+
+        data->temp_hyst = hyst_to_reg(temp - val);
         i2c_smbus_write_byte_data(client, LM90_REG_W_TCRIT_HYST,
-                                  hyst_to_reg(hyst));
+                                  data->temp_hyst);
         mutex_unlock(&data->update_lock);
         return count;
 }
@@ -682,6 +711,15 @@ static int lm90_detect(struct i2c_client *new_client, int kind,
                                 } else
                                 if ((chip_id & 0xF0) == 0x30) { /* LM89/LM99 */
                                         kind = lm99;
+                                        dev_info(&adapter->dev,
+                                                 "Assuming LM99 chip at "
+                                                 "0x%02x\n", address);
+                                        dev_info(&adapter->dev,
+                                                 "If it is an LM89, pass "
+                                                 "force_lm86=%d,0x%02x when "
+                                                 "loading the lm90 driver\n",
+                                                 i2c_adapter_id(adapter),
+                                                 address);
                                 } else
                                 if (address == 0x4C
                                  && (chip_id & 0xF0) == 0x10) { /* LM86 */
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index d4d1b859d4f1..fc12bd412e3a 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1968,7 +1968,7 @@ exit:
         return res;
 }
 
-static void __exit
+static void
 w83781d_isa_unregister(void)
 {
         if (pdev) {
@@ -2017,7 +2017,7 @@ w83781d_isa_register(void)
         return 0;
 }
 
-static void __exit
+static void
 w83781d_isa_unregister(void)
 {
 }
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 76bdc9a27f6f..2d848010499d 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -690,9 +690,9 @@ static int __init icside_init(void)
         return ecard_register_driver(&icside_driver);
 }
 
-static void __exit icside_exit(void);
+static void __exit icside_exit(void)
 {
-        ecard_unregister_driver(&icside_driver);
+        ecard_remove_driver(&icside_driver);
 }
 
 MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
diff --git a/drivers/ide/rapide.c b/drivers/ide/rapide.c
index 78d27d9ae430..d5003ca69801 100644
--- a/drivers/ide/rapide.c
+++ b/drivers/ide/rapide.c
@@ -11,7 +11,7 @@
 
 #include <asm/ecard.h>
 
-static struct const ide_port_info rapide_port_info = {
+static const struct ide_port_info rapide_port_info = {
         .host_flags             = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
 };
 
@@ -97,7 +97,7 @@ static int __init rapide_init(void)
 
 static void __exit rapide_exit(void)
 {
-        ecard_unregister_driver(&rapide_driver);
+        ecard_remove_driver(&rapide_driver);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 2b4e975770f3..4b7cb389dc49 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1915,92 +1915,6 @@ static void rtl_disable_msi(struct pci_dev *pdev, struct rtl8169_private *tp)
         }
 }
 
-static int rtl_eeprom_read(struct pci_dev *pdev, int cap, int addr, __le32 *val)
-{
-        int ret, count = 100;
-        u16 status = 0;
-        u32 value;
-
-        ret = pci_write_config_word(pdev, cap + PCI_VPD_ADDR, addr);
-        if (ret < 0)
-                return ret;
-
-        do {
-                udelay(10);
-                ret = pci_read_config_word(pdev, cap + PCI_VPD_ADDR, &status);
-                if (ret < 0)
-                        return ret;
-        } while (!(status & PCI_VPD_ADDR_F) && --count);
-
-        if (!(status & PCI_VPD_ADDR_F))
-                return -ETIMEDOUT;
-
-        ret = pci_read_config_dword(pdev, cap + PCI_VPD_DATA, &value);
-        if (ret < 0)
-                return ret;
-
-        *val = cpu_to_le32(value);
-
-        return 0;
-}
-
-static void rtl_init_mac_address(struct rtl8169_private *tp,
-                                 void __iomem *ioaddr)
-{
-        struct pci_dev *pdev = tp->pci_dev;
-        int vpd_cap;
-        __le32 sig;
-        u8 mac[8];
-        u8 cfg1;
-
-        cfg1 = RTL_R8(Config1);
-        if (!(cfg1  & VPD)) {
-                if (netif_msg_probe(tp))
-                        dev_info(&pdev->dev, "VPD access disabled, enabling\n");
-                RTL_W8(Cfg9346, Cfg9346_Unlock);
-                RTL_W8(Config1, cfg1 | VPD);
-                RTL_W8(Cfg9346, Cfg9346_Lock);
-        }
-
-        vpd_cap = pci_find_capability(pdev, PCI_CAP_ID_VPD);
-        if (!vpd_cap)
-                return;
-
-        if (rtl_eeprom_read(pdev, vpd_cap, RTL_EEPROM_SIG_ADDR, &sig) < 0)
-                return;
-
-        if ((sig & RTL_EEPROM_SIG_MASK) != RTL_EEPROM_SIG) {
-                dev_info(&pdev->dev, "Missing EEPROM signature: %08x\n", sig);
-                return;
-        }
-
-        /*
-         * MAC address is stored in EEPROM at offset 0x0e
-         * Realtek says: "The VPD address does not have to be a DWORD-aligned
-         * address as defined in the PCI 2.2 Specifications, but the VPD data
-         * is always consecutive 4-byte data starting from the VPD address
-         * specified."
-         */
-        if (rtl_eeprom_read(pdev, vpd_cap, 0x000e, (__le32*)&mac[0]) < 0 ||
-            rtl_eeprom_read(pdev, vpd_cap, 0x0012, (__le32*)&mac[4]) < 0) {
-                if (netif_msg_probe(tp)) {
-                        dev_warn(&pdev->dev,
-                                 "reading MAC address from EEPROM failed\n");
-                }
-                return;
-        }
-
-        if (netif_msg_probe(tp)) {
-                DECLARE_MAC_BUF(buf);
-
-                dev_info(&pdev->dev, "MAC address found in EEPROM: %s\n",
-                         print_mac(buf, mac));
-        }
-
-        if (is_valid_ether_addr(mac))
-                rtl_rar_set(tp, mac);
-}
-
 static int __devinit
 rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -2178,8 +2092,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         tp->mmio_addr = ioaddr;
 
-        rtl_init_mac_address(tp, ioaddr);
-
         /* Get MAC address */
         for (i = 0; i < MAC_ADDR_LEN; i++)
                 dev->dev_addr[i] = RTL_R8(MAC0 + i);