[PATCH 14/14] [PATCH] w1: warning fix

From: Andrew Morton <[email protected]>

drivers/w1/w1.c:423: warning: long long unsigned int format, __u64 arg (arg 8)

u64 is not, never has been and never will be "unsigned long long"!

While we're there, fix up some code layout - it looks awful in an 80-col
display.

Cc: Evgeniy Polyakov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/w1/w1.c |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index b41366a..de3e979 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -391,7 +391,8 @@ static void w1_destroy_master_attributes
 }
 
 #ifdef CONFIG_HOTPLUG
-static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
+static int w1_uevent(struct device *dev, char **envp, int num_envp,
+			char *buffer, int buffer_size)
 {
 	struct w1_master *md = NULL;
 	struct w1_slave *sl = NULL;
@@ -411,23 +412,28 @@ static int w1_uevent(struct device *dev,
 		return -EINVAL;
 	}
 
-	dev_dbg(dev, "Hotplug event for %s %s, bus_id=%s.\n", event_owner, name, dev->bus_id);
+	dev_dbg(dev, "Hotplug event for %s %s, bus_id=%s.\n",
+			event_owner, name, dev->bus_id);
 
 	if (dev->driver != &w1_slave_driver || !sl)
 		return 0;
 
-	err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_FID=%02X", sl->reg_num.family);
+	err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
+			&cur_len, "W1_FID=%02X", sl->reg_num.family);
 	if (err)
 		return err;
 
-	err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_SLAVE_ID=%024LX", (u64)sl->reg_num.id);
+	err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
+			&cur_len, "W1_SLAVE_ID=%024LX",
+			(unsigned long long)sl->reg_num.id);
 	if (err)
 		return err;
 
 	return 0;
 };
 #else
-static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
+static int w1_uevent(struct device *dev, char **envp, int num_envp,
+			char *buffer, int buffer_size)
 {
 	return 0;
 }
@@ -451,7 +457,8 @@ static int __w1_attach_slave_device(stru
 		 (unsigned int) sl->reg_num.family,
 		 (unsigned long long) sl->reg_num.id);
 
-	dev_dbg(&sl->dev, "%s: registering %s as %p.\n", __func__, &sl->dev.bus_id[0]);
+	dev_dbg(&sl->dev, "%s: registering %s as %p.\n", __func__,
+		&sl->dev.bus_id[0]);
 
 	err = device_register(&sl->dev);
 	if (err < 0) {
-- 
1.4.0

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

---

• References:
  • [GIT PATCH] W1 patches for 2.6.17
    • From: Greg KH <[email protected]>
  • [PATCH 1/14] [PATCH] w1: Added default generic read/write operations.
    • From: Greg KH <[email protected]>
  • [PATCH 2/14] [PATCH] w1: Replace dscore and ds_w1_bridge with ds2490 driver.
    • From: Greg KH <[email protected]>
  • [PATCH 3/14] [PATCH] w1: Userspace communication protocol over connector.
    • From: Greg KH <[email protected]>
  • [PATCH 4/14] [PATCH] w1: Move w1-connector definitions into linux/include/connector.h
    • From: Greg KH <[email protected]>
  • [PATCH 5/14] [PATCH] w1: netlink: Mark netlink group 1 as unused.
    • From: Greg KH <[email protected]>
  • [PATCH 6/14] [PATCH] w1: Make w1 connector notifications depend on connector.
    • From: Greg KH <[email protected]>
  • [PATCH 7/14] [PATCH] w1: Use mutexes instead of semaphores.
    • From: Greg KH <[email protected]>
  • [PATCH 8/14] [PATCH] w1 exports
    • From: Greg KH <[email protected]>
  • [PATCH 9/14] [PATCH] W1: cleanups
    • From: Greg KH <[email protected]>
  • [PATCH 10/14] [PATCH] W1: possible cleanups
    • From: Greg KH <[email protected]>
  • [PATCH 11/14] [PATCH] W1: fix dependencies of W1_SLAVE_DS2433_CRC
    • From: Greg KH <[email protected]>
  • [PATCH 12/14] [PATCH] drivers/w1/w1.c: fix a compile error
    • From: Greg KH <[email protected]>
  • [PATCH 13/14] [PATCH] w1: clean up W1_CON dependency.
    • From: Greg KH <[email protected]>

• Prev by Date: [PATCH 5/14] [PATCH] w1: netlink: Mark netlink group 1 as unused.
• Next by Date: [PATCH 4/14] [PATCH] w1: Move w1-connector definitions into linux/include/connector.h
• Previous by thread: [PATCH 13/14] [PATCH] w1: clean up W1_CON dependency.
• Next by thread: fix console suspend compile failure.
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]