diff options
Diffstat (limited to 'drivers/hwmon/abituguru3.c')
-rw-r--r-- | drivers/hwmon/abituguru3.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c index e89d572e3320..d30855a75786 100644 --- a/drivers/hwmon/abituguru3.c +++ b/drivers/hwmon/abituguru3.c | |||
@@ -1119,8 +1119,6 @@ static struct platform_driver abituguru3_driver = { | |||
1119 | .resume = abituguru3_resume | 1119 | .resume = abituguru3_resume |
1120 | }; | 1120 | }; |
1121 | 1121 | ||
1122 | #ifdef CONFIG_DMI | ||
1123 | |||
1124 | static int __init abituguru3_dmi_detect(void) | 1122 | static int __init abituguru3_dmi_detect(void) |
1125 | { | 1123 | { |
1126 | const char *board_vendor, *board_name; | 1124 | const char *board_vendor, *board_name; |
@@ -1159,15 +1157,6 @@ static int __init abituguru3_dmi_detect(void) | |||
1159 | return 1; | 1157 | return 1; |
1160 | } | 1158 | } |
1161 | 1159 | ||
1162 | #else /* !CONFIG_DMI */ | ||
1163 | |||
1164 | static inline int abituguru3_dmi_detect(void) | ||
1165 | { | ||
1166 | return 1; | ||
1167 | } | ||
1168 | |||
1169 | #endif /* CONFIG_DMI */ | ||
1170 | |||
1171 | /* FIXME: Manual detection should die eventually; we need to collect stable | 1160 | /* FIXME: Manual detection should die eventually; we need to collect stable |
1172 | * DMI model names first before we can rely entirely on CONFIG_DMI. | 1161 | * DMI model names first before we can rely entirely on CONFIG_DMI. |
1173 | */ | 1162 | */ |
@@ -1216,10 +1205,8 @@ static int __init abituguru3_init(void) | |||
1216 | if (err) | 1205 | if (err) |
1217 | return err; | 1206 | return err; |
1218 | 1207 | ||
1219 | #ifdef CONFIG_DMI | ||
1220 | pr_warn("this motherboard was not detected using DMI. " | 1208 | pr_warn("this motherboard was not detected using DMI. " |
1221 | "Please send the output of \"dmidecode\" to the abituguru3 maintainer (see MAINTAINERS)\n"); | 1209 | "Please send the output of \"dmidecode\" to the abituguru3 maintainer (see MAINTAINERS)\n"); |
1222 | #endif | ||
1223 | } | 1210 | } |
1224 | 1211 | ||
1225 | err = platform_driver_register(&abituguru3_driver); | 1212 | err = platform_driver_register(&abituguru3_driver); |