Patched in Tegra support.

1 files changed, 256 insertions, 311 deletions

diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index 7430f70ae45..d9c59271391 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -45,7 +45,7 @@
 static struct platform_device *pdev;
 
 /* Module load parameters */
-static bool force_start;
+static int force_start;
 module_param(force_start, bool, 0);
 MODULE_PARM_DESC(force_start, "Force the chip to start monitoring inputs");
 
@@ -53,7 +53,7 @@ static unsigned short force_id;
 module_param(force_id, ushort, 0);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
 
-static bool probe_all_addr;
+static int probe_all_addr;
 module_param(probe_all_addr, bool, 0);
 MODULE_PARM_DESC(probe_all_addr, "Include probing of non-standard LPC "
                  "addresses");
@@ -82,12 +82,12 @@ enum chips { dme1737, sch5027, sch311x, sch5127 };
  * --------------------------------------------------------------------- */
 
 /* Voltages (in) numbered 0-7 (ix) */
-#define DME1737_REG_IN(ix)              ((ix) < 5 ? 0x20 + (ix) : \
+#define DME1737_REG_IN(ix)              ((ix) < 5 ? 0x20 + (ix) : \
                                          (ix) < 7 ? 0x94 + (ix) : \
                                                     0x1f)
-#define DME1737_REG_IN_MIN(ix)          ((ix) < 5 ? 0x44 + (ix) * 2 \
+#define DME1737_REG_IN_MIN(ix)          ((ix) < 5 ? 0x44 + (ix) * 2 \
                                                   : 0x91 + (ix) * 2)
-#define DME1737_REG_IN_MAX(ix)          ((ix) < 5 ? 0x45 + (ix) * 2 \
+#define DME1737_REG_IN_MAX(ix)          ((ix) < 5 ? 0x45 + (ix) * 2 \
                                                   : 0x92 + (ix) * 2)
 
 /* Temperatures (temp) numbered 0-2 (ix) */
@@ -97,16 +97,14 @@ enum chips { dme1737, sch5027, sch311x, sch5127 };
 #define DME1737_REG_TEMP_OFFSET(ix)     ((ix) == 0 ? 0x1f \
                                                    : 0x1c + (ix))
 
-/*
- * Voltage and temperature LSBs
+/* Voltage and temperature LSBs
  * The LSBs (4 bits each) are stored in 5 registers with the following layouts:
  *    IN_TEMP_LSB(0) = [in5, in6]
  *    IN_TEMP_LSB(1) = [temp3, temp1]
  *    IN_TEMP_LSB(2) = [in4, temp2]
  *    IN_TEMP_LSB(3) = [in3, in0]
  *    IN_TEMP_LSB(4) = [in2, in1]
- *    IN_TEMP_LSB(5) = [res, in7]
- */
+ *    IN_TEMP_LSB(5) = [res, in7] */
 #define DME1737_REG_IN_TEMP_LSB(ix)     (0x84 + (ix))
 static const u8 DME1737_REG_IN_LSB[] = {3, 4, 4, 3, 2, 0, 0, 5};
 static const u8 DME1737_REG_IN_LSB_SHL[] = {4, 4, 0, 0, 0, 0, 4, 4};
@@ -129,30 +127,24 @@ static const u8 DME1737_REG_TEMP_LSB_SHL[] = {4, 4, 0};
 #define DME1737_REG_PWM_MIN(ix)         (0x64 + (ix)) /* only for pwm[0-2] */
 #define DME1737_REG_PWM_FREQ(ix)        ((ix) < 3 ? 0x5f + (ix) \
                                                   : 0xa3 + (ix))
-/*
- * The layout of the ramp rate registers is different from the other pwm
+/* The layout of the ramp rate registers is different from the other pwm
  * registers. The bits for the 3 PWMs are stored in 2 registers:
  *    PWM_RR(0) = [OFF3, OFF2,  OFF1,  RES,   RR1E, RR1-2, RR1-1, RR1-0]
- *    PWM_RR(1) = [RR2E, RR2-2, RR2-1, RR2-0, RR3E, RR3-2, RR3-1, RR3-0]
- */
+ *    PWM_RR(1) = [RR2E, RR2-2, RR2-1, RR2-0, RR3E, RR3-2, RR3-1, RR3-0] */
 #define DME1737_REG_PWM_RR(ix)          (0x62 + (ix)) /* only for pwm[0-2] */
 
 /* Thermal zones 0-2 */
 #define DME1737_REG_ZONE_LOW(ix)        (0x67 + (ix))
 #define DME1737_REG_ZONE_ABS(ix)        (0x6a + (ix))
-/*
- * The layout of the hysteresis registers is different from the other zone
+/* The layout of the hysteresis registers is different from the other zone
  * registers. The bits for the 3 zones are stored in 2 registers:
  *    ZONE_HYST(0) = [H1-3,  H1-2,  H1-1, H1-0, H2-3, H2-2, H2-1, H2-0]
- *    ZONE_HYST(1) = [H3-3,  H3-2,  H3-1, H3-0, RES,  RES,  RES,  RES]
- */
+ *    ZONE_HYST(1) = [H3-3,  H3-2,  H3-1, H3-0, RES,  RES,  RES,  RES] */
 #define DME1737_REG_ZONE_HYST(ix)       (0x6d + (ix))
 
-/*
- * Alarm registers and bit mapping
+/* Alarm registers and bit mapping
  * The 3 8-bit alarm registers will be concatenated to a single 32-bit
- * alarm value [0, ALARM3, ALARM2, ALARM1].
- */
+ * alarm value [0, ALARM3, ALARM2, ALARM1]. */
 #define DME1737_REG_ALARM1              0x41
 #define DME1737_REG_ALARM2              0x42
 #define DME1737_REG_ALARM3              0x83
@@ -265,11 +257,9 @@ static const int IN_NOMINAL_SCH5127[] = {2500, 2250, 3300, 1125, 1125, 3300,
                                  (type) == sch5127 ? IN_NOMINAL_SCH5127 : \
                                  IN_NOMINAL_DME1737)
 
-/*
- * Voltage input
+/* Voltage input
  * Voltage inputs have 16 bits resolution, limit values have 8 bits
- * resolution.
- */
+ * resolution. */
 static inline int IN_FROM_REG(int reg, int nominal, int res)
 {
         return (reg * nominal + (3 << (res - 3))) / (3 << (res - 2));
@@ -280,12 +270,10 @@ static inline int IN_TO_REG(int val, int nominal)
         return SENSORS_LIMIT((val * 192 + nominal / 2) / nominal, 0, 255);
 }
 
-/*
- * Temperature input
+/* Temperature input
  * The register values represent temperatures in 2's complement notation from
  * -127 degrees C to +127 degrees C. Temp inputs have 16 bits resolution, limit
- * values have 8 bits resolution.
- */
+ * values have 8 bits resolution. */
 static inline int TEMP_FROM_REG(int reg, int res)
 {
         return (reg * 1000) >> (res - 8);
@@ -312,19 +300,18 @@ static int TEMP_RANGE_TO_REG(int val, int reg)
         int i;
 
         for (i = 15; i > 0; i--) {
-                if (val > (TEMP_RANGE[i] + TEMP_RANGE[i - 1] + 1) / 2)
+                if (val > (TEMP_RANGE[i] + TEMP_RANGE[i - 1] + 1) / 2) {
                         break;
+                }
         }
 
         return (reg & 0x0f) | (i << 4);
 }
 
-/*
- * Temperature hysteresis
+/* Temperature hysteresis
  * Register layout:
  *    reg[0] = [H1-3, H1-2, H1-1, H1-0, H2-3, H2-2, H2-1, H2-0]
- *    reg[1] = [H3-3, H3-2, H3-1, H3-0, xxxx, xxxx, xxxx, xxxx]
- */
+ *    reg[1] = [H3-3, H3-2, H3-1, H3-0, xxxx, xxxx, xxxx, xxxx] */
 static inline int TEMP_HYST_FROM_REG(int reg, int ix)
 {
         return (((ix == 1) ? reg : reg >> 4) & 0x0f) * 1000;
@@ -340,10 +327,11 @@ static inline int TEMP_HYST_TO_REG(int val, int ix, int reg)
 /* Fan input RPM */
 static inline int FAN_FROM_REG(int reg, int tpc)
 {
-        if (tpc)
+        if (tpc) {
                 return tpc * reg;
-        else
+        } else {
                 return (reg == 0 || reg == 0xffff) ? 0 : 90000 * 60 / reg;
+        }
 }
 
 static inline int FAN_TO_REG(int val, int tpc)
@@ -356,21 +344,17 @@ static inline int FAN_TO_REG(int val, int tpc)
         }
 }
 
-/*
- * Fan TPC (tach pulse count)
+/* Fan TPC (tach pulse count)
  * Converts a register value to a TPC multiplier or returns 0 if the tachometer
- * is configured in legacy (non-tpc) mode
- */
+ * is configured in legacy (non-tpc) mode */
 static inline int FAN_TPC_FROM_REG(int reg)
 {
         return (reg & 0x20) ? 0 : 60 >> (reg & 0x03);
 }
 
-/*
- * Fan type
+/* Fan type
  * The type of a fan is expressed in number of pulses-per-revolution that it
- * emits
- */
+ * emits */
 static inline int FAN_TYPE_FROM_REG(int reg)
 {
         int edge = (reg >> 1) & 0x03;
@@ -394,8 +378,9 @@ static int FAN_MAX_FROM_REG(int reg)
         int i;
 
         for (i = 10; i > 0; i--) {
-                if (reg == FAN_MAX[i])
+                if (reg == FAN_MAX[i]) {
                         break;
+                }
         }
 
         return 1000 + i * 500;
@@ -406,15 +391,15 @@ static int FAN_MAX_TO_REG(int val)
         int i;
 
         for (i = 10; i > 0; i--) {
-                if (val > (1000 + (i - 1) * 500))
+                if (val > (1000 + (i - 1) * 500)) {
                         break;
+                }
         }
 
         return FAN_MAX[i];
 }
 
-/*
- * PWM enable
+/* PWM enable
  * Register to enable mapping:
  * 000:  2  fan on zone 1 auto
  * 001:  2  fan on zone 2 auto
@@ -423,8 +408,7 @@ static int FAN_MAX_TO_REG(int val)
  * 100: -1  fan disabled
  * 101:  2  fan on hottest of zones 2,3 auto
  * 110:  2  fan on hottest of zones 1,2,3 auto
- * 111:  1  fan in manual mode
- */
+ * 111:  1  fan in manual mode */
 static inline int PWM_EN_FROM_REG(int reg)
 {
         static const int en[] = {2, 2, 2, 0, -1, 2, 2, 1};
@@ -439,8 +423,7 @@ static inline int PWM_EN_TO_REG(int val, int reg)
         return (reg & 0x1f) | ((en & 0x07) << 5);
 }
 
-/*
- * PWM auto channels zone
+/* PWM auto channels zone
  * Register to auto channels zone mapping (ACZ is a bitfield with bit x
  * corresponding to zone x+1):
  * 000: 001  fan on zone 1 auto
@@ -450,8 +433,7 @@ static inline int PWM_EN_TO_REG(int val, int reg)
  * 100: 000  fan disabled
  * 101: 110  fan on hottest of zones 2,3 auto
  * 110: 111  fan on hottest of zones 1,2,3 auto
- * 111: 000  fan in manual mode
- */
+ * 111: 000  fan in manual mode */
 static inline int PWM_ACZ_FROM_REG(int reg)
 {
         static const int acz[] = {1, 2, 4, 0, 0, 6, 7, 0};
@@ -486,20 +468,19 @@ static int PWM_FREQ_TO_REG(int val, int reg)
                 i = 11;
         } else {
                 for (i = 9; i > 0; i--) {
-                        if (val > (PWM_FREQ[i] + PWM_FREQ[i - 1] + 1) / 2)
+                        if (val > (PWM_FREQ[i] + PWM_FREQ[i - 1] + 1) / 2) {
                                 break;
+                        }
                 }
         }
 
         return (reg & 0xf0) | i;
 }
 
-/*
- * PWM ramp rate
+/* PWM ramp rate
  * Register layout:
  *    reg[0] = [OFF3,  OFF2,  OFF1,  RES,   RR1-E, RR1-2, RR1-1, RR1-0]
- *    reg[1] = [RR2-E, RR2-2, RR2-1, RR2-0, RR3-E, RR3-2, RR3-1, RR3-0]
- */
+ *    reg[1] = [RR2-E, RR2-2, RR2-1, RR2-0, RR3-E, RR3-2, RR3-1, RR3-0] */
 static const u8 PWM_RR[] = {206, 104, 69, 41, 26, 18, 10, 5};
 
 static inline int PWM_RR_FROM_REG(int reg, int ix)
@@ -514,8 +495,9 @@ static int PWM_RR_TO_REG(int val, int ix, int reg)
         int i;
 
         for (i = 0; i < 7; i++) {
-                if (val > (PWM_RR[i] + PWM_RR[i + 1] + 1) / 2)
+                if (val > (PWM_RR[i] + PWM_RR[i + 1] + 1) / 2) {
                         break;
+                }
         }
 
         return (ix == 1) ? (reg & 0x8f) | (i << 4) : (reg & 0xf8) | i;
@@ -534,11 +516,9 @@ static inline int PWM_RR_EN_TO_REG(int val, int ix, int reg)
         return val ? reg | en : reg & ~en;
 }
 
-/*
- * PWM min/off
+/* PWM min/off
  * The PWM min/off bits are part of the PMW ramp rate register 0 (see above for
- * the register layout).
- */
+ * the register layout). */
 static inline int PWM_OFF_FROM_REG(int reg, int ix)
 {
         return (reg >> (ix + 5)) & 0x01;
@@ -624,13 +604,12 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
 
                 /* In (voltage) registers */
                 for (ix = 0; ix < ARRAY_SIZE(data->in); ix++) {
-                        /*
-                         * Voltage inputs are stored as 16 bit values even
+                        /* Voltage inputs are stored as 16 bit values even
                          * though they have only 12 bits resolution. This is
-                         * to make it consistent with the temp inputs.
-                         */
-                        if (ix == 7 && !(data->has_features & HAS_IN7))
+                         * to make it consistent with the temp inputs. */
+                        if (ix == 7 && !(data->has_features & HAS_IN7)) {
                                 continue;
+                        }
                         data->in[ix] = dme1737_read(data,
                                         DME1737_REG_IN(ix)) << 8;
                         data->in_min[ix] = dme1737_read(data,
@@ -641,13 +620,11 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
 
                 /* Temp registers */
                 for (ix = 0; ix < ARRAY_SIZE(data->temp); ix++) {
-                        /*
-                         * Temp inputs are stored as 16 bit values even
+                        /* Temp inputs are stored as 16 bit values even
                          * though they have only 12 bits resolution. This is
                          * to take advantage of implicit conversions between
                          * register values (2's complement) and temp values
-                         * (signed decimal).
-                         */
+                         * (signed decimal). */
                         data->temp[ix] = dme1737_read(data,
                                         DME1737_REG_TEMP(ix)) << 8;
                         data->temp_min[ix] = dme1737_read(data,
@@ -660,21 +637,21 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
                         }
                 }
 
-                /*
-                 * In and temp LSB registers
+                /* In and temp LSB registers
                  * The LSBs are latched when the MSBs are read, so the order in
                  * which the registers are read (MSB first, then LSB) is
-                 * important!
-                 */
+                 * important! */
                 for (ix = 0; ix < ARRAY_SIZE(lsb); ix++) {
-                        if (ix == 5 && !(data->has_features & HAS_IN7))
+                        if (ix == 5 && !(data->has_features & HAS_IN7)) {
                                 continue;
+                        }
                         lsb[ix] = dme1737_read(data,
                                         DME1737_REG_IN_TEMP_LSB(ix));
                 }
                 for (ix = 0; ix < ARRAY_SIZE(data->in); ix++) {
-                        if (ix == 7 && !(data->has_features & HAS_IN7))
+                        if (ix == 7 && !(data->has_features & HAS_IN7)) {
                                 continue;
+                        }
                         data->in[ix] |= (lsb[DME1737_REG_IN_LSB[ix]] <<
                                         DME1737_REG_IN_LSB_SHL[ix]) & 0xf0;
                 }
@@ -685,12 +662,11 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
 
                 /* Fan registers */
                 for (ix = 0; ix < ARRAY_SIZE(data->fan); ix++) {
-                        /*
-                         * Skip reading registers if optional fans are not
-                         * present
-                         */
-                        if (!(data->has_features & HAS_FAN(ix)))
+                        /* Skip reading registers if optional fans are not
+                         * present */
+                        if (!(data->has_features & HAS_FAN(ix))) {
                                 continue;
+                        }
                         data->fan[ix] = dme1737_read(data,
                                         DME1737_REG_FAN(ix));
                         data->fan[ix] |= dme1737_read(data,
@@ -710,12 +686,11 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
 
                 /* PWM registers */
                 for (ix = 0; ix < ARRAY_SIZE(data->pwm); ix++) {
-                        /*
-                         * Skip reading registers if optional PWMs are not
-                         * present
-                         */
-                        if (!(data->has_features & HAS_PWM(ix)))
+                        /* Skip reading registers if optional PWMs are not
+                         * present */
+                        if (!(data->has_features & HAS_PWM(ix))) {
                                 continue;
+                        }
                         data->pwm[ix] = dme1737_read(data,
                                         DME1737_REG_PWM(ix));
                         data->pwm_freq[ix] = dme1737_read(data,
@@ -736,8 +711,9 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
                 /* Thermal zone registers */
                 for (ix = 0; ix < ARRAY_SIZE(data->zone_low); ix++) {
                         /* Skip reading registers if zone3 is not present */
-                        if ((ix == 2) && !(data->has_features & HAS_ZONE3))
+                        if ((ix == 2) && !(data->has_features & HAS_ZONE3)) {
                                 continue;
+                        }
                         /* sch5127 zone2 registers are special */
                         if ((ix == 1) && (data->type == sch5127)) {
                                 data->zone_low[1] = dme1737_read(data,
@@ -761,10 +737,8 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
                 /* Alarm registers */
                 data->alarms = dme1737_read(data,
                                                 DME1737_REG_ALARM1);
-                /*
-                 * Bit 7 tells us if the other alarm registers are non-zero and
-                 * therefore also need to be read
-                 */
+                /* Bit 7 tells us if the other alarm registers are non-zero and
+                 * therefore also need to be read */
                 if (data->alarms & 0x80) {
                         data->alarms |= dme1737_read(data,
                                                 DME1737_REG_ALARM2) << 8;
@@ -772,18 +746,22 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
                                                 DME1737_REG_ALARM3) << 16;
                 }
 
-                /*
-                 * The ISA chips require explicit clearing of alarm bits.
+                /* The ISA chips require explicit clearing of alarm bits.
                  * Don't worry, an alarm will come back if the condition
-                 * that causes it still exists
-                 */
+                 * that causes it still exists */
                 if (!data->client) {
-                        if (data->alarms & 0xff0000)
-                                dme1737_write(data, DME1737_REG_ALARM3, 0xff);
-                        if (data->alarms & 0xff00)
-                                dme1737_write(data, DME1737_REG_ALARM2, 0xff);
-                        if (data->alarms & 0xff)
-                                dme1737_write(data, DME1737_REG_ALARM1, 0xff);
+                        if (data->alarms & 0xff0000) {
+                                dme1737_write(data, DME1737_REG_ALARM3,
+                                              0xff);
+                        }
+                        if (data->alarms & 0xff00) {
+                                dme1737_write(data, DME1737_REG_ALARM2,
+                                              0xff);
+                        }
+                        if (data->alarms & 0xff) {
+                                dme1737_write(data, DME1737_REG_ALARM1,
+                                              0xff);
+                        }
                 }
 
                 data->last_update = jiffies;
@@ -844,12 +822,7 @@ static ssize_t set_in(struct device *dev, struct device_attribute *attr,
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
         int fn = sensor_attr_2->nr;
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         switch (fn) {
@@ -928,12 +901,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *attr,
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
         int fn = sensor_attr_2->nr;
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         switch (fn) {
@@ -984,10 +952,11 @@ static ssize_t show_zone(struct device *dev, struct device_attribute *attr,
         switch (fn) {
         case SYS_ZONE_AUTO_CHANNELS_TEMP:
                 /* check config2 for non-standard temp-to-zone mapping */
-                if ((ix == 1) && (data->config2 & 0x02))
+                if ((ix == 1) && (data->config2 & 0x02)) {
                         res = 4;
-                else
+                } else {
                         res = 1 << ix;
+                }
                 break;
         case SYS_ZONE_AUTO_POINT1_TEMP_HYST:
                 res = TEMP_FROM_REG(data->zone_low[ix], 8) -
@@ -1020,12 +989,7 @@ static ssize_t set_zone(struct device *dev, struct device_attribute *attr,
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
         int fn = sensor_attr_2->nr;
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         switch (fn) {
@@ -1050,10 +1014,8 @@ static ssize_t set_zone(struct device *dev, struct device_attribute *attr,
                 /* Refresh the cache */
                 data->zone_low[ix] = dme1737_read(data,
                                                   DME1737_REG_ZONE_LOW(ix));
-                /*
-                 * Modify the temp range value (which is stored in the upper
-                 * nibble of the pwm_freq register)
-                 */
+                /* Modify the temp range value (which is stored in the upper
+                 * nibble of the pwm_freq register) */
                 data->pwm_freq[ix] = TEMP_RANGE_TO_REG(val -
                                         TEMP_FROM_REG(data->zone_low[ix], 8),
                                         dme1737_read(data,
@@ -1133,12 +1095,7 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
         int fn = sensor_attr_2->nr;
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         switch (fn) {
@@ -1213,19 +1170,21 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
 
         switch (fn) {
         case SYS_PWM:
-                if (PWM_EN_FROM_REG(data->pwm_config[ix]) == 0)
+                if (PWM_EN_FROM_REG(data->pwm_config[ix]) == 0) {
                         res = 255;
-                else
+                } else {
                         res = data->pwm[ix];
+                }
                 break;
         case SYS_PWM_FREQ:
                 res = PWM_FREQ_FROM_REG(data->pwm_freq[ix]);
                 break;
         case SYS_PWM_ENABLE:
-                if (ix >= 3)
+                if (ix >= 3) {
                         res = 1; /* pwm[5-6] hard-wired to manual mode */
-                else
+                } else {
                         res = PWM_EN_FROM_REG(data->pwm_config[ix]);
+                }
                 break;
         case SYS_PWM_RAMP_RATE:
                 /* Only valid for pwm[1-3] */
@@ -1233,17 +1192,19 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
                 break;
         case SYS_PWM_AUTO_CHANNELS_ZONE:
                 /* Only valid for pwm[1-3] */
-                if (PWM_EN_FROM_REG(data->pwm_config[ix]) == 2)
+                if (PWM_EN_FROM_REG(data->pwm_config[ix]) == 2) {
                         res = PWM_ACZ_FROM_REG(data->pwm_config[ix]);
-                else
+                } else {
                         res = data->pwm_acz[ix];
+                }
                 break;
         case SYS_PWM_AUTO_PWM_MIN:
                 /* Only valid for pwm[1-3] */
-                if (PWM_OFF_FROM_REG(data->pwm_rr[0], ix))
+                if (PWM_OFF_FROM_REG(data->pwm_rr[0], ix)) {
                         res = data->pwm_min[ix];
-                else
+                } else {
                         res = 0;
+                }
                 break;
         case SYS_PWM_AUTO_POINT1_PWM:
                 /* Only valid for pwm[1-3] */
@@ -1262,7 +1223,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
 }
 
 static struct attribute *dme1737_pwm_chmod_attr[];
-static void dme1737_chmod_file(struct device*, struct attribute*, umode_t);
+static void dme1737_chmod_file(struct device*, struct attribute*, mode_t);
 
 static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                        const char *buf, size_t count)
@@ -1272,12 +1233,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
         int fn = sensor_attr_2->nr;
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         switch (fn) {
@@ -1351,10 +1307,8 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                         /* Change permissions of pwm[ix] to read-only */
                         dme1737_chmod_file(dev, dme1737_pwm_chmod_attr[ix],
                                            S_IRUGO);
-                        /*
-                         * Turn on auto mode using the saved zone channel
-                         * assignment
-                         */
+                        /* Turn on auto mode using the saved zone channel
+                         * assignment */
                         data->pwm_config[ix] = PWM_ACZ_TO_REG(
                                                         data->pwm_acz[ix],
                                                         data->pwm_config[ix]);
@@ -1384,10 +1338,8 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                         data->pwm_rr[ix > 0] = PWM_RR_TO_REG(val, ix,
                                                         data->pwm_rr[ix > 0]);
                 }
-                /*
-                 * Enable/disable the feature only if the associated PWM
-                 * output is in automatic mode.
-                 */
+                /* Enable/disable the feature only if the associated PWM
+                 * output is in automatic mode. */
                 if (PWM_EN_FROM_REG(data->pwm_config[ix]) == 2) {
                         data->pwm_rr[ix > 0] = PWM_RR_EN_TO_REG(val > 0, ix,
                                                         data->pwm_rr[ix > 0]);
@@ -1409,19 +1361,15 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                 data->pwm_config[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_CONFIG(ix));
                 if (PWM_EN_FROM_REG(data->pwm_config[ix]) == 2) {
-                        /*
-                         * PWM is already in auto mode so update the temp
-                         * channel assignment
-                         */
+                        /* PWM is already in auto mode so update the temp
+                         * channel assignment */
                         data->pwm_config[ix] = PWM_ACZ_TO_REG(val,
                                                 data->pwm_config[ix]);
                         dme1737_write(data, DME1737_REG_PWM_CONFIG(ix),
                                       data->pwm_config[ix]);
                 } else {
-                        /*
-                         * PWM is not in auto mode so we save the temp
-                         * channel assignment for later use
-                         */
+                        /* PWM is not in auto mode so we save the temp
+                         * channel assignment for later use */
                         data->pwm_acz[ix] = val;
                 }
                 break;
@@ -1430,12 +1378,10 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                 /* Refresh the cache */
                 data->pwm_min[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_MIN(ix));
-                /*
-                 * There are only 2 values supported for the auto_pwm_min
+                /* There are only 2 values supported for the auto_pwm_min
                  * value: 0 or auto_point1_pwm. So if the temperature drops
                  * below the auto_point1_temp_hyst value, the fan either turns
-                 * off or runs at auto_point1_pwm duty-cycle.
-                 */
+                 * off or runs at auto_point1_pwm duty-cycle. */
                 if (val > ((data->pwm_min[ix] + 1) / 2)) {
                         data->pwm_rr[0] = PWM_OFF_TO_REG(1, ix,
                                                 dme1737_read(data,
@@ -1480,12 +1426,7 @@ static ssize_t set_vrm(struct device *dev, struct device_attribute *attr,
                        const char *buf, size_t count)
 {
         struct dme1737_data *data = dev_get_drvdata(dev);
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        long val = simple_strtol(buf, NULL, 10);
 
         data->vrm = val;
         return count;
@@ -1645,12 +1586,10 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);   /* for ISA devices */
 
-/*
- * This struct holds all the attributes that are always present and need to be
+/* This struct holds all the attributes that are always present and need to be
  * created unconditionally. The attributes that need modification of their
  * permissions are created read-only and write permissions are added or removed
- * on the fly when required
- */
+ * on the fly when required */
 static struct attribute *dme1737_attr[] = {
         /* Voltages */
         &sensor_dev_attr_in0_input.dev_attr.attr,
@@ -1713,11 +1652,9 @@ static const struct attribute_group dme1737_group = {
         .attrs = dme1737_attr,
 };
 
-/*
- * The following struct holds temp offset attributes, which are not available
+/* The following struct holds temp offset attributes, which are not available
  * in all chips. The following chips support them:
- * DME1737, SCH311x
- */
+ * DME1737, SCH311x */
 static struct attribute *dme1737_temp_offset_attr[] = {
         &sensor_dev_attr_temp1_offset.dev_attr.attr,
         &sensor_dev_attr_temp2_offset.dev_attr.attr,
@@ -1729,11 +1666,9 @@ static const struct attribute_group dme1737_temp_offset_group = {
         .attrs = dme1737_temp_offset_attr,
 };
 
-/*
- * The following struct holds VID related attributes, which are not available
+/* The following struct holds VID related attributes, which are not available
  * in all chips. The following chips support them:
- * DME1737
- */
+ * DME1737 */
 static struct attribute *dme1737_vid_attr[] = {
         &dev_attr_vrm.attr,
         &dev_attr_cpu0_vid.attr,
@@ -1744,11 +1679,9 @@ static const struct attribute_group dme1737_vid_group = {
         .attrs = dme1737_vid_attr,
 };
 
-/*
- * The following struct holds temp zone 3 related attributes, which are not
+/* The following struct holds temp zone 3 related attributes, which are not
  * available in all chips. The following chips support them:
- * DME1737, SCH311x, SCH5027
- */
+ * DME1737, SCH311x, SCH5027 */
 static struct attribute *dme1737_zone3_attr[] = {
         &sensor_dev_attr_zone3_auto_point1_temp.dev_attr.attr,
         &sensor_dev_attr_zone3_auto_point2_temp.dev_attr.attr,
@@ -1762,11 +1695,9 @@ static const struct attribute_group dme1737_zone3_group = {
 };
 
 
-/*
- * The following struct holds temp zone hysteresis related attributes, which
+/* The following struct holds temp zone hysteresis related attributes, which
  * are not available in all chips. The following chips support them:
- * DME1737, SCH311x
- */
+ * DME1737, SCH311x */
 static struct attribute *dme1737_zone_hyst_attr[] = {
         &sensor_dev_attr_zone1_auto_point1_temp_hyst.dev_attr.attr,
         &sensor_dev_attr_zone2_auto_point1_temp_hyst.dev_attr.attr,
@@ -1778,11 +1709,9 @@ static const struct attribute_group dme1737_zone_hyst_group = {
         .attrs = dme1737_zone_hyst_attr,
 };
 
-/*
- * The following struct holds voltage in7 related attributes, which
+/* The following struct holds voltage in7 related attributes, which
  * are not available in all chips. The following chips support them:
- * SCH5127
- */
+ * SCH5127 */
 static struct attribute *dme1737_in7_attr[] = {
         &sensor_dev_attr_in7_input.dev_attr.attr,
         &sensor_dev_attr_in7_min.dev_attr.attr,
@@ -1795,11 +1724,9 @@ static const struct attribute_group dme1737_in7_group = {
         .attrs = dme1737_in7_attr,
 };
 
-/*
- * The following structs hold the PWM attributes, some of which are optional.
+/* The following structs hold the PWM attributes, some of which are optional.
  * Their creation depends on the chip configuration which is determined during
- * module load.
- */
+ * module load. */
 static struct attribute *dme1737_pwm1_attr[] = {
         &sensor_dev_attr_pwm1.dev_attr.attr,
         &sensor_dev_attr_pwm1_freq.dev_attr.attr,
@@ -1852,22 +1779,18 @@ static const struct attribute_group dme1737_pwm_group[] = {
         { .attrs = dme1737_pwm6_attr },
 };
 
-/*
- * The following struct holds auto PWM min attributes, which are not available
+/* The following struct holds auto PWM min attributes, which are not available
  * in all chips. Their creation depends on the chip type which is determined
- * during module load.
- */
+ * during module load. */
 static struct attribute *dme1737_auto_pwm_min_attr[] = {
         &sensor_dev_attr_pwm1_auto_pwm_min.dev_attr.attr,
         &sensor_dev_attr_pwm2_auto_pwm_min.dev_attr.attr,
         &sensor_dev_attr_pwm3_auto_pwm_min.dev_attr.attr,
 };
 
-/*
- * The following structs hold the fan attributes, some of which are optional.
+/* The following structs hold the fan attributes, some of which are optional.
  * Their creation depends on the chip configuration which is determined during
- * module load.
- */
+ * module load. */
 static struct attribute *dme1737_fan1_attr[] = {
         &sensor_dev_attr_fan1_input.dev_attr.attr,
         &sensor_dev_attr_fan1_min.dev_attr.attr,
@@ -1920,10 +1843,8 @@ static const struct attribute_group dme1737_fan_group[] = {
         { .attrs = dme1737_fan6_attr },
 };
 
-/*
- * The permissions of the following zone attributes are changed to read-
- * writeable if the chip is *not* locked. Otherwise they stay read-only.
- */
+/* The permissions of the following zone attributes are changed to read-
+ * writeable if the chip is *not* locked. Otherwise they stay read-only. */
 static struct attribute *dme1737_zone_chmod_attr[] = {
         &sensor_dev_attr_zone1_auto_point1_temp.dev_attr.attr,
         &sensor_dev_attr_zone1_auto_point2_temp.dev_attr.attr,
@@ -1939,10 +1860,8 @@ static const struct attribute_group dme1737_zone_chmod_group = {
 };
 
 
-/*
- * The permissions of the following zone 3 attributes are changed to read-
- * writeable if the chip is *not* locked. Otherwise they stay read-only.
- */
+/* The permissions of the following zone 3 attributes are changed to read-
+ * writeable if the chip is *not* locked. Otherwise they stay read-only. */
 static struct attribute *dme1737_zone3_chmod_attr[] = {
         &sensor_dev_attr_zone3_auto_point1_temp.dev_attr.attr,
         &sensor_dev_attr_zone3_auto_point2_temp.dev_attr.attr,
@@ -1954,11 +1873,9 @@ static const struct attribute_group dme1737_zone3_chmod_group = {
         .attrs = dme1737_zone3_chmod_attr,
 };
 
-/*
- * The permissions of the following PWM attributes are changed to read-
+/* The permissions of the following PWM attributes are changed to read-
  * writeable if the chip is *not* locked and the respective PWM is available.
- * Otherwise they stay read-only.
- */
+ * Otherwise they stay read-only. */
 static struct attribute *dme1737_pwm1_chmod_attr[] = {
         &sensor_dev_attr_pwm1_freq.dev_attr.attr,
         &sensor_dev_attr_pwm1_enable.dev_attr.attr,
@@ -2003,10 +1920,8 @@ static const struct attribute_group dme1737_pwm_chmod_group[] = {
         { .attrs = dme1737_pwm6_chmod_attr },
 };
 
-/*
- * Pwm[1-3] are read-writeable if the associated pwm is in manual mode and the
- * chip is not locked. Otherwise they are read-only.
- */
+/* Pwm[1-3] are read-writeable if the associated pwm is in manual mode and the
+ * chip is not locked. Otherwise they are read-only. */
 static struct attribute *dme1737_pwm_chmod_attr[] = {
         &sensor_dev_attr_pwm1.dev_attr.attr,
         &sensor_dev_attr_pwm2.dev_attr.attr,
@@ -2046,7 +1961,7 @@ static inline void dme1737_sio_outb(int sio_cip, int reg, int val)
 static int dme1737_i2c_get_features(int, struct dme1737_data*);
 
 static void dme1737_chmod_file(struct device *dev,
-                               struct attribute *attr, umode_t mode)
+                               struct attribute *attr, mode_t mode)
 {
         if (sysfs_chmod_file(&dev->kobj, attr, mode)) {
                 dev_warn(dev, "Failed to change permissions of %s.\n",
@@ -2056,12 +1971,13 @@ static void dme1737_chmod_file(struct device *dev,
 
 static void dme1737_chmod_group(struct device *dev,
                                 const struct attribute_group *group,
-                                umode_t mode)
+                                mode_t mode)
 {
         struct attribute **attr;
 
-        for (attr = group->attrs; *attr; attr++)
+        for (attr = group->attrs; *attr; attr++) {
                 dme1737_chmod_file(dev, *attr, mode);
+        }
 }
 
 static void dme1737_remove_files(struct device *dev)
@@ -2087,20 +2003,26 @@ static void dme1737_remove_files(struct device *dev)
                 }
         }
 
-        if (data->has_features & HAS_TEMP_OFFSET)
+        if (data->has_features & HAS_TEMP_OFFSET) {
                 sysfs_remove_group(&dev->kobj, &dme1737_temp_offset_group);
-        if (data->has_features & HAS_VID)
+        }
+        if (data->has_features & HAS_VID) {
                 sysfs_remove_group(&dev->kobj, &dme1737_vid_group);
-        if (data->has_features & HAS_ZONE3)
+        }
+        if (data->has_features & HAS_ZONE3) {
                 sysfs_remove_group(&dev->kobj, &dme1737_zone3_group);
-        if (data->has_features & HAS_ZONE_HYST)
+        }
+        if (data->has_features & HAS_ZONE_HYST) {
                 sysfs_remove_group(&dev->kobj, &dme1737_zone_hyst_group);
-        if (data->has_features & HAS_IN7)
+        }
+        if (data->has_features & HAS_IN7) {
                 sysfs_remove_group(&dev->kobj, &dme1737_in7_group);
+        }
         sysfs_remove_group(&dev->kobj, &dme1737_group);
 
-        if (!data->client)
+        if (!data->client) {
                 sysfs_remove_file(&dev->kobj, &dev_attr_name.attr);
+        }
 }
 
 static int dme1737_create_files(struct device *dev)
@@ -2111,41 +2033,48 @@ static int dme1737_create_files(struct device *dev)
         /* Create a name attribute for ISA devices */
         if (!data->client) {
                 err = sysfs_create_file(&dev->kobj, &dev_attr_name.attr);
-                if (err)
+                if (err) {
                         goto exit;
+                }
         }
 
         /* Create standard sysfs attributes */
         err = sysfs_create_group(&dev->kobj, &dme1737_group);
-        if (err)
+        if (err) {
                 goto exit_remove;
+        }
 
         /* Create chip-dependent sysfs attributes */
         if (data->has_features & HAS_TEMP_OFFSET) {
                 err = sysfs_create_group(&dev->kobj,
                                          &dme1737_temp_offset_group);
-                if (err)
+                if (err) {
                         goto exit_remove;
+                }
         }
         if (data->has_features & HAS_VID) {
                 err = sysfs_create_group(&dev->kobj, &dme1737_vid_group);
-                if (err)
+                if (err) {
                         goto exit_remove;
+                }
         }
         if (data->has_features & HAS_ZONE3) {
                 err = sysfs_create_group(&dev->kobj, &dme1737_zone3_group);
-                if (err)
+                if (err) {
                         goto exit_remove;
+                }
         }
         if (data->has_features & HAS_ZONE_HYST) {
                 err = sysfs_create_group(&dev->kobj, &dme1737_zone_hyst_group);
-                if (err)
+                if (err) {
                         goto exit_remove;
+                }
         }
         if (data->has_features & HAS_IN7) {
                 err = sysfs_create_group(&dev->kobj, &dme1737_in7_group);
-                if (err)
+                if (err) {
                         goto exit_remove;
+                }
         }
 
         /* Create fan sysfs attributes */
@@ -2153,8 +2082,9 @@ static int dme1737_create_files(struct device *dev)
                 if (data->has_features & HAS_FAN(ix)) {
                         err = sysfs_create_group(&dev->kobj,
                                                  &dme1737_fan_group[ix]);
-                        if (err)
+                        if (err) {
                                 goto exit_remove;
+                        }
                 }
         }
 
@@ -2163,21 +2093,21 @@ static int dme1737_create_files(struct device *dev)
                 if (data->has_features & HAS_PWM(ix)) {
                         err = sysfs_create_group(&dev->kobj,
                                                  &dme1737_pwm_group[ix]);
-                        if (err)
+                        if (err) {
                                 goto exit_remove;
+                        }
                         if ((data->has_features & HAS_PWM_MIN) && (ix < 3)) {
                                 err = sysfs_create_file(&dev->kobj,
                                                 dme1737_auto_pwm_min_attr[ix]);
-                                if (err)
+                                if (err) {
                                         goto exit_remove;
+                                }
                         }
                 }
         }
 
-        /*
-         * Inform if the device is locked. Otherwise change the permissions of
-         * selected attributes from read-only to read-writeable.
-         */
+        /* Inform if the device is locked. Otherwise change the permissions of
+         * selected attributes from read-only to read-writeable. */
         if (data->config & 0x02) {
                 dev_info(dev, "Device is locked. Some attributes "
                          "will be read-only.\n");
@@ -2264,30 +2194,26 @@ static int dme1737_init_device(struct device *dev)
                 return -EFAULT;
         }
 
-        /*
-         * Determine which optional fan and pwm features are enabled (only
-         * valid for I2C devices)
-         */
+        /* Determine which optional fan and pwm features are enabled (only
+         * valid for I2C devices) */
         if (client) {   /* I2C chip */
                 data->config2 = dme1737_read(data, DME1737_REG_CONFIG2);
                 /* Check if optional fan3 input is enabled */
-                if (data->config2 & 0x04)
+                if (data->config2 & 0x04) {
                         data->has_features |= HAS_FAN(2);
+                }
 
-                /*
-                 * Fan4 and pwm3 are only available if the client's I2C address
+                /* Fan4 and pwm3 are only available if the client's I2C address
                  * is the default 0x2e. Otherwise the I/Os associated with
-                 * these functions are used for addr enable/select.
-                 */
-                if (client->addr == 0x2e)
+                 * these functions are used for addr enable/select. */
+                if (client->addr == 0x2e) {
                         data->has_features |= HAS_FAN(3) | HAS_PWM(2);
+                }
 
-                /*
-                 * Determine which of the optional fan[5-6] and pwm[5-6]
+                /* Determine which of the optional fan[5-6] and pwm[5-6]
                  * features are enabled. For this, we need to query the runtime
                  * registers through the Super-IO LPC interface. Try both
-                 * config ports 0x2e and 0x4e.
-                 */
+                 * config ports 0x2e and 0x4e. */
                 if (dme1737_i2c_get_features(0x2e, data) &&
                     dme1737_i2c_get_features(0x4e, data)) {
                         dev_warn(dev, "Failed to query Super-IO for optional "
@@ -2345,11 +2271,9 @@ static int dme1737_init_device(struct device *dev)
                          ((reg >> 4) & 0x03) + 1);
         }
 
-        /*
-         * Switch pwm[1-3] to manual mode if they are currently disabled and
+        /* Switch pwm[1-3] to manual mode if they are currently disabled and
          * set the duty-cycles to 0% (which is identical to the PWMs being
-         * disabled).
-         */
+         * disabled). */
         if (!(data->config & 0x02)) {
                 for (ix = 0; ix < 3; ix++) {
                         data->pwm_config[ix] = dme1737_read(data,
@@ -2374,8 +2298,9 @@ static int dme1737_init_device(struct device *dev)
         data->pwm_acz[2] = 4;   /* pwm3 -> zone3 */
 
         /* Set VRM */
-        if (data->has_features & HAS_VID)
+        if (data->has_features & HAS_VID) {
                 data->vrm = vid_which_vrm();
+        }
 
         return 0;
 }
@@ -2393,10 +2318,8 @@ static int dme1737_i2c_get_features(int sio_cip, struct dme1737_data *data)
 
         dme1737_sio_enter(sio_cip);
 
-        /*
-         * Check device ID
-         * We currently know about two kinds of DME1737 and SCH5027.
-         */
+        /* Check device ID
+         * We currently know about two kinds of DME1737 and SCH5027. */
         reg = force_id ? force_id : dme1737_sio_inb(sio_cip, 0x20);
         if (!(reg == DME1737_ID_1 || reg == DME1737_ID_2 ||
               reg == SCH5027_ID)) {
@@ -2415,19 +2338,21 @@ static int dme1737_i2c_get_features(int sio_cip, struct dme1737_data *data)
                 goto exit;
         }
 
-        /*
-         * Read the runtime registers to determine which optional features
+        /* Read the runtime registers to determine which optional features
          * are enabled and available. Bits [3:2] of registers 0x43-0x46 are set
-         * to '10' if the respective feature is enabled.
-         */
-        if ((inb(addr + 0x43) & 0x0c) == 0x08) /* fan6 */
+         * to '10' if the respective feature is enabled. */
+        if ((inb(addr + 0x43) & 0x0c) == 0x08) { /* fan6 */
                 data->has_features |= HAS_FAN(5);
-        if ((inb(addr + 0x44) & 0x0c) == 0x08) /* pwm6 */
+        }
+        if ((inb(addr + 0x44) & 0x0c) == 0x08) { /* pwm6 */
                 data->has_features |= HAS_PWM(5);
-        if ((inb(addr + 0x45) & 0x0c) == 0x08) /* fan5 */
+        }
+        if ((inb(addr + 0x45) & 0x0c) == 0x08) { /* fan5 */
                 data->has_features |= HAS_FAN(4);
-        if ((inb(addr + 0x46) & 0x0c) == 0x08) /* pwm5 */
+        }
+        if ((inb(addr + 0x46) & 0x0c) == 0x08) { /* pwm5 */
                 data->has_features |= HAS_PWM(4);
+        }
 
 exit:
         dme1737_sio_exit(sio_cip);
@@ -2444,8 +2369,9 @@ static int dme1737_i2c_detect(struct i2c_client *client,
         u8 company, verstep = 0;
         const char *name;
 
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 return -ENODEV;
+        }
 
         company = i2c_smbus_read_byte_data(client, DME1737_REG_COMPANY);
         verstep = i2c_smbus_read_byte_data(client, DME1737_REG_VERSTEP);
@@ -2475,9 +2401,11 @@ static int dme1737_i2c_probe(struct i2c_client *client,
         struct device *dev = &client->dev;
         int err;
 
-        data = devm_kzalloc(dev, sizeof(struct dme1737_data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        data = kzalloc(sizeof(struct dme1737_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
 
         i2c_set_clientdata(client, data);
         data->type = id->driver_data;
@@ -2489,14 +2417,14 @@ static int dme1737_i2c_probe(struct i2c_client *client,
         err = dme1737_init_device(dev);
         if (err) {
                 dev_err(dev, "Failed to initialize device.\n");
-                return err;
+                goto exit_kfree;
         }
 
         /* Create sysfs files */
         err = dme1737_create_files(dev);
         if (err) {
                 dev_err(dev, "Failed to create sysfs files.\n");
-                return err;
+                goto exit_kfree;
         }
 
         /* Register device */
@@ -2511,6 +2439,9 @@ static int dme1737_i2c_probe(struct i2c_client *client,
 
 exit_remove:
         dme1737_remove_files(dev);
+exit_kfree:
+        kfree(data);
+exit:
         return err;
 }
 
@@ -2521,6 +2452,7 @@ static int dme1737_i2c_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         dme1737_remove_files(&client->dev);
 
+        kfree(data);
         return 0;
 }
 
@@ -2554,10 +2486,8 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr)
 
         dme1737_sio_enter(sio_cip);
 
-        /*
-         * Check device ID
-         * We currently know about SCH3112, SCH3114, SCH3116, and SCH5127
-         */
+        /* Check device ID
+         * We currently know about SCH3112, SCH3114, SCH3116, and SCH5127 */
         reg = force_id ? force_id : dme1737_sio_inb(sio_cip, 0x20);
         if (!(reg == SCH3112_ID || reg == SCH3114_ID || reg == SCH3116_ID ||
               reg == SCH5127_ID)) {
@@ -2577,10 +2507,8 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr)
                 goto exit;
         }
 
-        /*
-         * Access to the hwmon registers is through an index/data register
-         * pair located at offset 0x70/0x71.
-         */
+        /* Access to the hwmon registers is through an index/data register
+         * pair located at offset 0x70/0x71. */
         *addr = base_addr + 0x70;
 
 exit:
@@ -2630,7 +2558,7 @@ exit:
         return err;
 }
 
-static int dme1737_isa_probe(struct platform_device *pdev)
+static int __devinit dme1737_isa_probe(struct platform_device *pdev)
 {
         u8 company, device;
         struct resource *res;
@@ -2639,16 +2567,19 @@ static int dme1737_isa_probe(struct platform_device *pdev)
         int err;
 
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        if (!devm_request_region(dev, res->start, DME1737_EXTENT, "dme1737")) {
+        if (!request_region(res->start, DME1737_EXTENT, "dme1737")) {
                 dev_err(dev, "Failed to request region 0x%04x-0x%04x.\n",
                         (unsigned short)res->start,
                         (unsigned short)res->start + DME1737_EXTENT - 1);
-                return -EBUSY;
+                err = -EBUSY;
+                goto exit;
         }
 
-        data = devm_kzalloc(dev, sizeof(struct dme1737_data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        data = kzalloc(sizeof(struct dme1737_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit_release_region;
+        }
 
         data->addr = res->start;
         platform_set_drvdata(pdev, data);
@@ -2674,14 +2605,16 @@ static int dme1737_isa_probe(struct platform_device *pdev)
                            (device == SCH5127_DEVICE)) {
                         data->type = sch5127;
                 } else {
-                        return -ENODEV;
+                        err = -ENODEV;
+                        goto exit_kfree;
                 }
         }
 
-        if (data->type == sch5127)
+        if (data->type == sch5127) {
                 data->name = "sch5127";
-        else
+        } else {
                 data->name = "sch311x";
+        }
 
         /* Initialize the mutex */
         mutex_init(&data->update_lock);
@@ -2693,14 +2626,14 @@ static int dme1737_isa_probe(struct platform_device *pdev)
         err = dme1737_init_device(dev);
         if (err) {
                 dev_err(dev, "Failed to initialize device.\n");
-                return err;
+                goto exit_kfree;
         }
 
         /* Create sysfs files */
         err = dme1737_create_files(dev);
         if (err) {
                 dev_err(dev, "Failed to create sysfs files.\n");
-                return err;
+                goto exit_kfree;
         }
 
         /* Register device */
@@ -2715,15 +2648,24 @@ static int dme1737_isa_probe(struct platform_device *pdev)
 
 exit_remove_files:
         dme1737_remove_files(dev);
+exit_kfree:
+        platform_set_drvdata(pdev, NULL);
+        kfree(data);
+exit_release_region:
+        release_region(res->start, DME1737_EXTENT);
+exit:
         return err;
 }
 
-static int dme1737_isa_remove(struct platform_device *pdev)
+static int __devexit dme1737_isa_remove(struct platform_device *pdev)
 {
         struct dme1737_data *data = platform_get_drvdata(pdev);
 
         hwmon_device_unregister(data->hwmon_dev);
         dme1737_remove_files(&pdev->dev);
+        release_region(data->addr, DME1737_EXTENT);
+        platform_set_drvdata(pdev, NULL);
+        kfree(data);
 
         return 0;
 }
@@ -2734,7 +2676,7 @@ static struct platform_driver dme1737_isa_driver = {
                 .name = "dme1737",
         },
         .probe = dme1737_isa_probe,
-        .remove = dme1737_isa_remove,
+        .remove = __devexit_p(dme1737_isa_remove),
 };
 
 /* ---------------------------------------------------------------------
@@ -2747,8 +2689,9 @@ static int __init dme1737_init(void)
         unsigned short addr;
 
         err = i2c_add_driver(&dme1737_i2c_driver);
-        if (err)
+        if (err) {
                 goto exit;
+        }
 
         if (dme1737_isa_detect(0x2e, &addr) &&
             dme1737_isa_detect(0x4e, &addr) &&
@@ -2760,13 +2703,15 @@ static int __init dme1737_init(void)
         }
 
         err = platform_driver_register(&dme1737_isa_driver);
-        if (err)
+        if (err) {
                 goto exit_del_i2c_driver;
+        }
 
         /* Sets global pdev as a side effect */
         err = dme1737_isa_device_add(addr);
-        if (err)
+        if (err) {
                 goto exit_del_isa_driver;
+        }
 
         return 0;