[PATCH] w1: fix build issues

From: Greg KH
Date: Wed Jun 22 2005 - 00:16:30 EST


[PATCH] w1: fix build issues

Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
commit c7b2b2a723174d22a743180d5367f0028226031b
tree 9f4261361e660b64c71da0022304e23875c3561e
parent ca775c629a366ded01aae69da8410f70aaf85de1
author Greg Kroah-Hartman <gregkh@xxxxxxx> Tue, 21 Jun 2005 21:01:59 -0700
committer Greg Kroah-Hartman <gregkh@xxxxxxx> Tue, 21 Jun 2005 21:43:10 -0700

drivers/w1/w1_smem.c | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/drivers/w1/w1_smem.c b/drivers/w1/w1_smem.c
--- a/drivers/w1/w1_smem.c
+++ b/drivers/w1/w1_smem.c
@@ -37,14 +37,11 @@ MODULE_AUTHOR("Evgeniy Polyakov <johnpol
MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, 64bit memory family.");

static ssize_t w1_smem_read_name(struct device *, struct device_attribute *attr, char *);
-static ssize_t w1_smem_read_val(struct device *, struct device_attribute *attr, char *);
static ssize_t w1_smem_read_bin(struct kobject *, char *, loff_t, size_t);

static struct w1_family_ops w1_smem_fops = {
.rname = &w1_smem_read_name,
.rbin = &w1_smem_read_bin,
- .rval = &w1_smem_read_val,
- .rvalname = "id",
};

static ssize_t w1_smem_read_name(struct device *dev, struct device_attribute *attr, char *buf)
@@ -54,19 +51,6 @@ static ssize_t w1_smem_read_name(struct
return sprintf(buf, "%s\n", sl->name);
}

-static ssize_t w1_smem_read_val(struct device *dev, struct device_attribute *attr, char *buf)
-{
- struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
- int i;
- ssize_t count = 0;
-
- for (i = 0; i < 8; ++i)
- count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]);
- count += sprintf(buf + count, "\n");
-
- return count;
-}
-
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),

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/