hwmon: (s3c) Use dev_get_drvdata()

[linux-2.6-block.git] / drivers / hwmon / max6621.c

diff --git a/drivers/hwmon/max6621.c b/drivers/hwmon/max6621.c
index 35555f0eefb96239d9d94cb5641c5f2abcef3255..1810a753f1a3e0f81f11f18694f36858c7b65e87 100644 (file)
--- a/drivers/hwmon/max6621.c
+++ b/drivers/hwmon/max6621.c
@@ -458,37 +458,19 @@ static const struct regmap_config max6621_regmap_config = {
        .num_reg_defaults = ARRAY_SIZE(max6621_regmap_default),
 };
 
-static u32 max6621_chip_config[] = {
-       HWMON_C_REGISTER_TZ,
-       0
-};
-
-static const struct hwmon_channel_info max6621_chip = {
-       .type = hwmon_chip,
-       .config = max6621_chip_config,
-};
-
-static const u32 max6621_temp_config[] = {
-       HWMON_T_INPUT | HWMON_T_LABEL | HWMON_T_OFFSET,
-       HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,
-       HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,
-       HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,
-       HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,
-       HWMON_T_INPUT | HWMON_T_LABEL,
-       HWMON_T_INPUT | HWMON_T_LABEL,
-       HWMON_T_INPUT | HWMON_T_LABEL,
-       HWMON_T_INPUT | HWMON_T_LABEL,
-       0
-};
-
-static const struct hwmon_channel_info max6621_temp = {
-       .type = hwmon_temp,
-       .config = max6621_temp_config,
-};
-
 static const struct hwmon_channel_info *max6621_info[] = {
-       &max6621_chip,
-       &max6621_temp,
+       HWMON_CHANNEL_INFO(chip,
+                          HWMON_C_REGISTER_TZ),
+       HWMON_CHANNEL_INFO(temp,
+                          HWMON_T_INPUT | HWMON_T_LABEL | HWMON_T_OFFSET,
+                          HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_LABEL),
        NULL
 };
 
@@ -570,7 +552,7 @@ static const struct i2c_device_id max6621_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, max6621_id);
 
-static const struct of_device_id max6621_of_match[] = {
+static const struct of_device_id __maybe_unused max6621_of_match[] = {
        { .compatible = "maxim,max6621" },
        { }
 };