From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Fri, 3 Feb 2006 11:03:52 +0000 (-0800)
Subject: [PATCH] s390: fix to_channelpath macro
X-Git-Tag: v2.6.16-rc3~283
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=501fe31df4bb94999fbe9bb42f05527df5525683;p=linux-2.6

[PATCH] s390: fix to_channelpath macro

Fix broken to_channelpath macro (fortunately worked in all current cases...).

Signed-off-by: Cornelia Huck <cohuck@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index 44e4b4bb1c..3e75095f35 100644
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -68,6 +68,6 @@ extern void *chsc_get_chp_desc(struct subchannel*, int);
 
 extern int chsc_enable_facility(int);
 
-#define to_channelpath(dev) container_of(dev, struct channel_path, dev)
+#define to_channelpath(device) container_of(device, struct channel_path, dev)
 
 #endif