Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760584AbbBIKF0 (ORCPT ); Mon, 9 Feb 2015 05:05:26 -0500 Received: from mail-ie0-f171.google.com ([209.85.223.171]:35254 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760508AbbBIKFY (ORCPT ); Mon, 9 Feb 2015 05:05:24 -0500 MIME-Version: 1.0 In-Reply-To: <20150209021518.GC3045@shlinux2> References: <1423346106-13493-1-git-send-email-baspeters93@gmail.com> <1423346106-13493-2-git-send-email-baspeters93@gmail.com> <20150209021518.GC3045@shlinux2> Date: Mon, 9 Feb 2015 11:05:24 +0100 Message-ID: Subject: Re: [PATCH 1/6] drivers: usb: core: devio.c: remove assignment of variables in if conditions. From: Bas Peters To: Peter Chen Cc: gregkh@linuxgoundation.org, Alan Stern , dan.j.williams@intel.com, hdegoede@redhat.com, sarah.a.sharp@linux.intel.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3185 Lines: 83 2015-02-09 3:15 GMT+01:00 Peter Chen : > On Sat, Feb 07, 2015 at 10:55:01PM +0100, Bas Peters wrote: >> This patch removes assignment of variables in if conditions in >> accordance witht the CodingStyle. > > %s/witht/with Typo, my bad. Should I fix the commit message and resend? > >> >> Signed-off-by: Bas Peters >> --- >> drivers/usb/core/devio.c | 15 ++++++++++----- >> 1 file changed, 10 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c >> index 0b59731..ea3c737 100644 >> --- a/drivers/usb/core/devio.c >> +++ b/drivers/usb/core/devio.c >> @@ -1081,7 +1081,8 @@ static int proc_bulk(struct usb_dev_state *ps, void __user *arg) >> ret = usbfs_increase_memory_usage(len1 + sizeof(struct urb)); >> if (ret) >> return ret; >> - if (!(tbuf = kmalloc(len1, GFP_KERNEL))) { >> + tbuf = kmalloc(len1, GFP_KERNEL); >> + if (!tbuf) { >> ret = -ENOMEM; >> goto done; >> } >> @@ -1223,7 +1224,8 @@ static int proc_setintf(struct usb_dev_state *ps, void __user *arg) >> >> if (copy_from_user(&setintf, arg, sizeof(setintf))) >> return -EFAULT; >> - if ((ret = checkintf(ps, setintf.interface))) >> + ret = checkintf(ps, setintf.interface); >> + if (ret) >> return ret; >> >> destroy_async_on_interface(ps, setintf.interface); >> @@ -1392,7 +1394,8 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb >> number_of_packets = uurb->number_of_packets; >> isofrmlen = sizeof(struct usbdevfs_iso_packet_desc) * >> number_of_packets; >> - if (!(isopkt = kmalloc(isofrmlen, GFP_KERNEL))) >> + isopkt = kmalloc(isofrmlen, GFP_KERNEL); >> + if (!isopkt) >> return -ENOMEM; >> if (copy_from_user(isopkt, iso_frame_desc, isofrmlen)) { >> ret = -EFAULT; >> @@ -1901,7 +1904,8 @@ static int proc_releaseinterface(struct usb_dev_state *ps, void __user *arg) >> >> if (get_user(ifnum, (unsigned int __user *)arg)) >> return -EFAULT; >> - if ((ret = releaseintf(ps, ifnum)) < 0) >> + ret = releaseintf(ps, ifnum); >> + if (ret < 0) >> return ret; >> destroy_async_on_interface (ps, ifnum); >> return 0; >> @@ -1916,7 +1920,8 @@ static int proc_ioctl(struct usb_dev_state *ps, struct usbdevfs_ioctl *ctl) >> struct usb_driver *driver = NULL; >> >> /* alloc buffer */ >> - if ((size = _IOC_SIZE(ctl->ioctl_code)) > 0) { >> + size = _IOC_SIZE(ctl->ioctl_code); >> + if (size > 0) { >> buf = kmalloc(size, GFP_KERNEL); >> if (buf == NULL) >> return -ENOMEM; >> -- >> 2.1.0 >> > > -- > > Best Regards, > Peter Chen -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/