Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0909fca5 authored by Andrew Morton's avatar Andrew Morton Committed by Anton Vorontsov
Browse files

git-battery vs git-acpi 



drivers/w1/slaves/w1_ds2760.c:85: warning: initialization from incompatible pointer type

The ACPI guys changed the bin_attr APIs
(commit 91a69029)

Cc: Anton Vorontsov <cbou@mail.ru>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7b3d54a8

drivers/w1/slaves/w1_ds2760.c

+3 −2
Original line number Diff line number Diff line
@@ -68,8 +68,9 @@ int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count) 
	return w1_ds2760_io(dev, buf, addr, count, 1);

}



static ssize_t w1_ds2760_read_bin(struct kobject *kobj, char *buf, loff_t off,

				  size_t count)

static ssize_t w1_ds2760_read_bin(struct kobject *kobj,

				  struct bin_attribute *bin_attr,

				  char *buf, loff_t off, size_t count)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	return w1_ds2760_read(dev, buf, off, count);