| Message ID | 20121104102840.GA27124@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 8c610fa..2875f31 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c @@ -1275,7 +1275,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) int ret; int i; char __user *p; - char *s; union iocpar { char name[10]; char bname[22]; @@ -1284,6 +1283,9 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) isdn_net_ioctl_cfg cfg; } iocpar; void __user *argp = (void __user *)arg; +#ifdef CONFIG_NETDEVICES + char *s; +#endif #define name iocpar.name #define bname iocpar.bname
Thanks for reviewing Paul. Here's the result: Author: Lee Jones <lee.jones@linaro.org> Date: Sat Nov 3 22:06:02 2012 +0100 isdn: Encapsulate variable 's' in same CONFIG_NETDEVICES guards as code using it In the current case, variable 's' of type 'char *' is defined but then not used if !CONFIG_NETDEVICES, casing the compile-time warning below. In this change we surround the declaration using the same guards as the pre-processed code which makes use of it. This patch fixes: drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’: drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable] Cc: Karsten Keil <isdn@linux-pingi.de> Cc: netdev@vger.kernel.org Signed-off-by: Lee Jones <lee.jones@linaro.org> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html