| Message ID | 1305475662-4478-1-git-send-email-zonque@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | dd2ed487fdd78b50549b2ca8418875c0d9f4a30e |
| Headers | show |
On Sun, 15 May 2011, Daniel Mack wrote: > As they are static members of fix size, there is no need to them. > > Signed-off-by: Daniel Mack <zonque@gmail.com> > Cc: Dmitry Torokhov <dtor@mail.ru> > Cc: Jiri Kosina <jkosina@suse.cz> > --- > drivers/hid/hidraw.c | 14 ++------------ > drivers/hid/usbhid/hiddev.c | 18 ++---------------- > 2 files changed, 4 insertions(+), 28 deletions(-) > > diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c > index 54409cb..3dd1877 100644 > --- a/drivers/hid/hidraw.c > +++ b/drivers/hid/hidraw.c > @@ -395,12 +395,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, > } > > if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) { > - int len; > - if (!hid->name) { > - ret = 0; > - break; > - } > - len = strlen(hid->name) + 1; > + int len = strlen(hid->name) + 1; > if (len > _IOC_SIZE(cmd)) > len = _IOC_SIZE(cmd); > ret = copy_to_user(user_arg, hid->name, len) ? > @@ -409,12 +404,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, > } > > if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) { > - int len; > - if (!hid->phys) { > - ret = 0; > - break; > - } > - len = strlen(hid->phys) + 1; > + int len = strlen(hid->phys) + 1; > if (len > _IOC_SIZE(cmd)) > len = _IOC_SIZE(cmd); > ret = copy_to_user(user_arg, hid->phys, len) ? > diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c > index af0a7c1..5ca9c35 100644 > --- a/drivers/hid/usbhid/hiddev.c > +++ b/drivers/hid/usbhid/hiddev.c > @@ -801,14 +801,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) > break; > > if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) { > - int len; > - > - if (!hid->name) { > - r = 0; > - break; > - } > - > - len = strlen(hid->name) + 1; > + int len = strlen(hid->name) + 1; > if (len > _IOC_SIZE(cmd)) > len = _IOC_SIZE(cmd); > r = copy_to_user(user_arg, hid->name, len) ? > @@ -817,14 +810,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) > } > > if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) { > - int len; > - > - if (!hid->phys) { > - r = 0; > - break; > - } > - > - len = strlen(hid->phys) + 1; > + int len = strlen(hid->phys) + 1; > if (len > _IOC_SIZE(cmd)) > len = _IOC_SIZE(cmd); > r = copy_to_user(user_arg, hid->phys, len) ? Applied, thanks.
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index 54409cb..3dd1877 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -395,12 +395,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, } if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) { - int len; - if (!hid->name) { - ret = 0; - break; - } - len = strlen(hid->name) + 1; + int len = strlen(hid->name) + 1; if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd); ret = copy_to_user(user_arg, hid->name, len) ? @@ -409,12 +404,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, } if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) { - int len; - if (!hid->phys) { - ret = 0; - break; - } - len = strlen(hid->phys) + 1; + int len = strlen(hid->phys) + 1; if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd); ret = copy_to_user(user_arg, hid->phys, len) ? diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index af0a7c1..5ca9c35 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -801,14 +801,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) { - int len; - - if (!hid->name) { - r = 0; - break; - } - - len = strlen(hid->name) + 1; + int len = strlen(hid->name) + 1; if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd); r = copy_to_user(user_arg, hid->name, len) ? @@ -817,14 +810,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) } if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) { - int len; - - if (!hid->phys) { - r = 0; - break; - } - - len = strlen(hid->phys) + 1; + int len = strlen(hid->phys) + 1; if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd); r = copy_to_user(user_arg, hid->phys, len) ?
As they are static members of fix size, there is no need to them. Signed-off-by: Daniel Mack <zonque@gmail.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Jiri Kosina <jkosina@suse.cz> --- drivers/hid/hidraw.c | 14 ++------------ drivers/hid/usbhid/hiddev.c | 18 ++---------------- 2 files changed, 4 insertions(+), 28 deletions(-)