X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=drivers%2Fw1%2Fw1_smem.c;h=2b6580c7e95328f1f332c82a544e45e3a5f40844;hb=ea7d8f65c865ebfa1d7cd67c360a87333ff013c1;hp=70d2d469963cfe8e57be5b242c31ae1bec525a69;hpb=5028770a42e7bc4d15791a44c28f0ad539323807;p=cascardo%2Flinux.git

diff --git a/drivers/w1/w1_smem.c b/drivers/w1/w1_smem.c
index 70d2d469963c..2b6580c7e953 100644
--- a/drivers/w1/w1_smem.c
+++ b/drivers/w1/w1_smem.c
@@ -46,15 +46,13 @@ static struct w1_family_ops w1_smem_fops = {
 
 static ssize_t w1_smem_read_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
-	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
-
+	struct w1_slave *sl = dev_to_w1_slave(dev);
 	return sprintf(buf, "%s\n", sl->name);
 }
 
 static ssize_t w1_smem_read_bin(struct kobject *kobj, char *buf, loff_t off, size_t count)
 {
-	struct w1_slave *sl = container_of(container_of(kobj, struct device, kobj),
-					   struct w1_slave, dev);
+	struct w1_slave *sl = kobj_to_w1_slave(kobj);
 	int i;
 
 	atomic_inc(&sl->refcnt);