aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-13 16:33:54 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-13 16:33:54 -0700
commitdd0aa67cd7cf3f4a3ca52ecc1d6b82f3fad1352b (patch)
treec7cc1c36872fa6e185acd78ec9545ee14b865c17
parent526be41625a8b2282d5720dcb19f927edbf193b4 (diff)
Revert "w1: introduce a slave mutex for serializing IO"
This reverts commit 59d4467be405316916a4087d5b02d99196eeef04. Turns out it was the wrong version, will apply the correct version after this. Reported-by: NeilBrown <neilb@suse.de> Cc: Evgeniy Polyakov <zbr@ioremap.net> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/w1/slaves/w1_bq27000.c4
-rw-r--r--drivers/w1/w1.c1
-rw-r--r--drivers/w1/w1.h1
3 files changed, 2 insertions, 4 deletions
diff --git a/drivers/w1/slaves/w1_bq27000.c b/drivers/w1/slaves/w1_bq27000.c
index 87554788fa3..52ad812fa1e 100644
--- a/drivers/w1/slaves/w1_bq27000.c
+++ b/drivers/w1/slaves/w1_bq27000.c
@@ -31,10 +31,10 @@ static int w1_bq27000_read(struct device *dev, unsigned int reg)
u8 val;
struct w1_slave *sl = container_of(dev->parent, struct w1_slave, dev);
- mutex_lock(&sl->mutex);
+ mutex_lock(&sl->master->mutex);
w1_write_8(sl->master, HDQ_CMD_READ | reg);
val = w1_read_8(sl->master);
- mutex_unlock(&sl->mutex);
+ mutex_unlock(&sl->master->mutex);
return val;
}
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 79e488db510..bfb89864102 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -686,7 +686,6 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
memcpy(&sl->reg_num, rn, sizeof(sl->reg_num));
atomic_set(&sl->refcnt, 0);
init_completion(&sl->released);
- mutex_init(&sl->mutex);
spin_lock(&w1_flock);
f = w1_family_registered(rn->family);
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index 8c8be380a98..4d012ca3f32 100644
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -75,7 +75,6 @@ struct w1_slave
void *family_data;
struct device dev;
struct completion released;
- struct mutex mutex;
};
typedef void (*w1_slave_found_callback)(struct w1_master *, u64);