diff options
author | Bitan Biswas <bbiswas@nvidia.com> | 2011-10-07 16:33:29 +0530 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:24 -0800 |
commit | 24f93b889fa1ccbebbde3e929ada725489c6a7cc (patch) | |
tree | 527525c9016822d14ff63e3c318b13ea80ead363 /drivers/misc | |
parent | 9bfcca7af6db9bbaa9496d453168c384ca768eb5 (diff) |
misc: nct1008: driver clean up
nct1008 driver has been changed as follows:
1. debugfs create file error check corrected.
2. pr_err usage replaced with dev_err calls
Reviewed-on: http://git-master/r/56651
(cherry picked from commit 5b6c784d9caf4e0551361b3601711fc9641a4dba)
Reviewed-on: http://git-master/r/57358
(cherry picked from commit eadf4dae6c4e2cd1e4daa618f69605683faaa540)
Change-Id: Ib2f914822691ac7d03bb1b2235544aff5e7abee3
Reviewed-on: http://git-master/r/57876
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Tested-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: Joshua Primero <jprimero@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Rebase-Id: Rbab698ab6544b8e275c19e51049d9f7ec586e471
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/nct1008.c | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/drivers/misc/nct1008.c b/drivers/misc/nct1008.c index f9cd5a120a4c..f3bd0fe12960 100644 --- a/drivers/misc/nct1008.c +++ b/drivers/misc/nct1008.c @@ -80,6 +80,7 @@ struct nct1008_data { struct i2c_client *client; struct nct1008_platform_data plat_data; struct mutex mutex; + struct dentry *dent; u8 config; s8 *limits; u8 limits_sz; @@ -381,7 +382,7 @@ static int nct1008_enable(struct i2c_client *client) err = i2c_smbus_write_byte_data(client, CONFIG_WR, data->config & ~STANDBY_BIT); if (err < 0) - pr_err("%s, line=%d, i2c write error=%d\n", + dev_err(&client->dev, "%s, line=%d, i2c write error=%d\n", __func__, __LINE__, err); return err; } @@ -394,7 +395,7 @@ static int nct1008_disable(struct i2c_client *client) err = i2c_smbus_write_byte_data(client, CONFIG_WR, data->config | STANDBY_BIT); if (err < 0) - pr_err("%s, line=%d, i2c write error=%d\n", + dev_err(&client->dev, "%s, line=%d, i2c write error=%d\n", __func__, __LINE__, err); return err; } @@ -412,15 +413,15 @@ static int nct1008_disable_alert(struct nct1008_data *data) */ val = i2c_smbus_read_byte_data(data->client, CONFIG_RD); if (val < 0) { - pr_err("%s, line=%d, disable alert failed ... " + dev_err(&client->dev, "%s, line=%d, disable alert failed ... " "i2c read error=%d\n", __func__, __LINE__, val); return val; } data->config = val | ALERT_BIT; ret = i2c_smbus_write_byte_data(client, CONFIG_WR, val | ALERT_BIT); if (ret) - pr_err("%s: fail to disable alert, i2c write error=%d#\n", - __func__, ret); + dev_err(&client->dev, "%s: fail to disable alert, i2c " + "write error=%d#\n", __func__, ret); return ret; } @@ -432,15 +433,16 @@ static int nct1008_enable_alert(struct nct1008_data *data) val = i2c_smbus_read_byte_data(data->client, CONFIG_RD); if (val < 0) { - pr_err("%s, line=%d, enable alert failed ... " - "i2c read error=%d\n", __func__, __LINE__, val); + dev_err(&data->client->dev, "%s, line=%d, enable alert " + "failed ... i2c read error=%d\n", __func__, + __LINE__, val); return val; } val &= ~(ALERT_BIT | THERM2_BIT); ret = i2c_smbus_write_byte_data(data->client, CONFIG_WR, val); if (ret) { - pr_err("%s: fail to enable alert, i2c write error=%d\n", - __func__, ret); + dev_err(&data->client->dev, "%s: fail to enable alert, i2c " + "write error=%d\n", __func__, ret); return ret; } @@ -451,7 +453,8 @@ static bool throttle_enb; static void therm_throttle(struct nct1008_data *data, bool enable) { if (!data->alarm_fn) { - pr_err("system too hot. no way to cool down!\n"); + dev_err(&data->client->dev, "system too hot. no way to " + "cool down!\n"); return; } @@ -481,14 +484,15 @@ static void nct1008_work_func(struct work_struct *work) intr_status = i2c_smbus_read_byte_data(data->client, STATUS_RD); if (intr_status < 0) { - pr_err("%s, line=%d, i2c read error=%d\n", + dev_err(&data->client->dev, "%s, line=%d, i2c read error=%d\n", __func__, __LINE__, intr_status); return; } err = nct1008_get_temp(&data->client->dev, &temperature); if (err) { - pr_err("%s: get temp fail(%d)", __func__, err); + dev_err(&data->client->dev, "%s: get temp fail(%d)", __func__, + err); return; } @@ -498,7 +502,7 @@ static void nct1008_work_func(struct work_struct *work) err = nct1008_disable_alert(data); if (err) { - pr_err("%s: disable alert fail(error=%d)\n", + dev_err(&data->client->dev, "%s: disable alert fail(error=%d)\n", __func__, err); return; } @@ -573,7 +577,8 @@ out: nct1008_enable_alert(data); if (err) - pr_err("%s: fail(error=%d)\n", __func__, err); + dev_err(&data->client->dev, "%s: fail(error=%d)\n", __func__, + err); else pr_debug("%s: done\n", __func__); } @@ -834,8 +839,11 @@ static int __devinit nct1008_probe(struct i2c_client *client, dev_info(&client->dev, "%s: initialized\n", __func__); err = nct1008_enable(client); /* sensor is running */ - if (err < 0) + if (err < 0) { + dev_err(&client->dev, "Error: %s, line=%d, error=%d\n", + __func__, __LINE__, err); goto error; + } /* switch to extended mode reports correct temperature * from next measurement cycle */ @@ -846,7 +854,8 @@ static int __devinit nct1008_probe(struct i2c_client *client, } err = nct1008_get_temp(&data->client->dev, &temperature); if (err) { - pr_err("%s: get temp fail(%d)", __func__, err); + dev_err(&data->client->dev, "%s: get temp fail(%d)", + __func__, err); return 0; /*do not fail init on the 1st read */ } @@ -884,10 +893,7 @@ static int nct1008_suspend(struct i2c_client *client, pm_message_t state) disable_irq(client->irq); err = nct1008_disable(client); - if (err < 0) - return err; - - return 0; + return err; } static int nct1008_resume(struct i2c_client *client) @@ -896,8 +902,11 @@ static int nct1008_resume(struct i2c_client *client) int err; err = nct1008_enable(client); - if (err < 0) + if (err < 0) { + dev_err(&client->dev, "Error: %s, error=%d\n", + __func__, err); return err; + } enable_irq(client->irq); schedule_work(&data->work); |