Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363045
b: refs/heads/master
c: 236d903
h: refs/heads/master
i:
  363043: a9ad39f
v: v3
  • Loading branch information
Guenter Roeck committed Apr 8, 2013
1 parent 1d7cf38 commit 2048abf
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0fc1f8fc614ca0fef78011b34ef8da638eb9acea
refs/heads/master: 236d9039480059f97dc9d3cd75e3651582b62997
10 changes: 0 additions & 10 deletions trunk/drivers/hwmon/nct6775.c
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,6 @@ struct nct6775_data {
const char *name;

struct device *hwmon_dev;
struct mutex lock;

u16 reg_temp[4][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
* 3=temp_crit
Expand Down Expand Up @@ -745,8 +744,6 @@ static u16 nct6775_read_value(struct nct6775_data *data, u16 reg)
{
int res, word_sized = is_word_sized(data, reg);

mutex_lock(&data->lock);

nct6775_set_bank(data, reg);
outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
res = inb_p(data->addr + DATA_REG_OFFSET);
Expand All @@ -755,17 +752,13 @@ static u16 nct6775_read_value(struct nct6775_data *data, u16 reg)
data->addr + ADDR_REG_OFFSET);
res = (res << 8) + inb_p(data->addr + DATA_REG_OFFSET);
}

mutex_unlock(&data->lock);
return res;
}

static int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
{
int word_sized = is_word_sized(data, reg);

mutex_lock(&data->lock);

nct6775_set_bank(data, reg);
outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
if (word_sized) {
Expand All @@ -774,8 +767,6 @@ static int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
data->addr + ADDR_REG_OFFSET);
}
outb_p(value & 0xff, data->addr + DATA_REG_OFFSET);

mutex_unlock(&data->lock);
return 0;
}

Expand Down Expand Up @@ -3416,7 +3407,6 @@ static int nct6775_probe(struct platform_device *pdev)

data->kind = sio_data->kind;
data->addr = res->start;
mutex_init(&data->lock);
mutex_init(&data->update_lock);
data->name = nct6775_device_names[data->kind];
data->bank = 0xff; /* Force initial bank selection */
Expand Down

0 comments on commit 2048abf

Please sign in to comment.