aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/adm1026.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 7fe2441fc845..546be0588798 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -455,7 +455,7 @@ static void adm1026_print_gpio(struct i2c_client *client)
455 struct adm1026_data *data = i2c_get_clientdata(client); 455 struct adm1026_data *data = i2c_get_clientdata(client);
456 int i; 456 int i;
457 457
458 dev_dbg(&client->dev, "GPIO config is:"); 458 dev_dbg(&client->dev, "GPIO config is:\n");
459 for (i = 0;i <= 7;++i) { 459 for (i = 0;i <= 7;++i) {
460 if (data->config2 & (1 << i)) { 460 if (data->config2 & (1 << i)) {
461 dev_dbg(&client->dev, "\t%sGP%s%d\n", 461 dev_dbg(&client->dev, "\t%sGP%s%d\n",
@@ -1681,17 +1681,16 @@ static int adm1026_detect(struct i2c_client *client, int kind,
1681 kind = adm1026; 1681 kind = adm1026;
1682 } else if (company == ADM1026_COMPANY_ANALOG_DEV 1682 } else if (company == ADM1026_COMPANY_ANALOG_DEV
1683 && (verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) { 1683 && (verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) {
1684 dev_err(&adapter->dev, ": Unrecognized stepping " 1684 dev_err(&adapter->dev, "Unrecognized stepping "
1685 "0x%02x. Defaulting to ADM1026.\n", verstep); 1685 "0x%02x. Defaulting to ADM1026.\n", verstep);
1686 kind = adm1026; 1686 kind = adm1026;
1687 } else if ((verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) { 1687 } else if ((verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) {
1688 dev_err(&adapter->dev, ": Found version/stepping " 1688 dev_err(&adapter->dev, "Found version/stepping "
1689 "0x%02x. Assuming generic ADM1026.\n", 1689 "0x%02x. Assuming generic ADM1026.\n",
1690 verstep); 1690 verstep);
1691 kind = any_chip; 1691 kind = any_chip;
1692 } else { 1692 } else {
1693 dev_dbg(&adapter->dev, ": Autodetection " 1693 dev_dbg(&adapter->dev, "Autodetection failed\n");
1694 "failed\n");
1695 /* Not an ADM1026 ... */ 1694 /* Not an ADM1026 ... */
1696 if (kind == 0) { /* User used force=x,y */ 1695 if (kind == 0) { /* User used force=x,y */
1697 dev_err(&adapter->dev, "Generic ADM1026 not " 1696 dev_err(&adapter->dev, "Generic ADM1026 not "