| Message ID | 20220720072346.33511-1-dzm91@hust.edu.cn |
|---|---|
| State | New |
| Headers | show |
| Series | usb: trancevibrator: simplify tv_probe | expand |
Le 20/07/2022 à 09:23, Dongliang Mu a écrit : > From: Dongliang Mu <mudongliangabcd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > > The function tv_probe does not need to invoke kfree when the > allocation fails. So let's simplify the code of tv_probe. > Another change is to remove a redundant space. > > Signed-off-by: Dongliang Mu <mudongliangabcd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- > drivers/usb/misc/trancevibrator.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c > index 26baba3ab7d7..30d4d774d448 100644 > --- a/drivers/usb/misc/trancevibrator.c > +++ b/drivers/usb/misc/trancevibrator.c > @@ -84,29 +84,22 @@ static int tv_probe(struct usb_interface *interface, > { > struct usb_device *udev = interface_to_usbdev(interface); > struct trancevibrator *dev; > - int retval; > > dev = kzalloc(sizeof(struct trancevibrator), GFP_KERNEL); > - if (!dev) { > - retval = -ENOMEM; > - goto error; > - } > + if (!dev) > + return -ENOMEM; > > dev->udev = usb_get_dev(udev); > usb_set_intfdata(interface, dev); > > return 0; Hi, looks like: error: kfree(dev); return retval; at the end of the function can be removed as-well. Just my 2c. CJ
Le 20/07/2022 à 09:56, Dongliang Mu a écrit : > On Wed, Jul 20, 2022 at 3:46 PM Christophe JAILLET > <christophe.jaillet-39ZsbGIQGT5GWvitb5QawA@public.gmane.org> wrote: >> >> Le 20/07/2022 à 09:23, Dongliang Mu a écrit : >>> From: Dongliang Mu <mudongliangabcd-Re5JQEeQqe8AvxtiuMwx3w-XMD5yJDbdMToUJ55TTLPZA@public.gmane.org.org> >>> >>> The function tv_probe does not need to invoke kfree when the >>> allocation fails. So let's simplify the code of tv_probe. >>> Another change is to remove a redundant space. >>> >>> Signed-off-by: Dongliang Mu <mudongliangabcd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> >>> --- >>> drivers/usb/misc/trancevibrator.c | 13 +++---------- >>> 1 file changed, 3 insertions(+), 10 deletions(-) >>> >>> diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c >>> index 26baba3ab7d7..30d4d774d448 100644 >>> --- a/drivers/usb/misc/trancevibrator.c >>> +++ b/drivers/usb/misc/trancevibrator.c >>> @@ -84,29 +84,22 @@ static int tv_probe(struct usb_interface *interface, >>> { >>> struct usb_device *udev = interface_to_usbdev(interface); >>> struct trancevibrator *dev; >>> - int retval; >>> >>> dev = kzalloc(sizeof(struct trancevibrator), GFP_KERNEL); >>> - if (!dev) { >>> - retval = -ENOMEM; >>> - goto error; >>> - } >>> + if (!dev) >>> + return -ENOMEM; >>> >>> dev->udev = usb_get_dev(udev); >>> usb_set_intfdata(interface, dev); >>> >>> return 0; >> >> Hi, >> >> looks like: >> >> error: >> kfree(dev); >> return retval; >> >> at the end of the function can be removed as-well. >> > > My patch actually removes them. Sorry for the noise. My mailer or newsgroup server sometimes plays me some tricks and only displays partial message :(. CJ > >> Just my 2c. >> >> CJ >
On Wed, Jul 20, 2022 at 03:23:43PM +0800, Dongliang Mu wrote: > From: Dongliang Mu <mudongliangabcd@gmail.com> > > The function tv_probe does not need to invoke kfree when the > allocation fails. So let's simplify the code of tv_probe. > Another change is to remove a redundant space. Those are two different things, please resend as a patch series of 2 different patches. thanks, greg k-h
On Wed, Jul 27, 2022 at 8:26 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > On Wed, Jul 20, 2022 at 03:23:43PM +0800, Dongliang Mu wrote: > > From: Dongliang Mu <mudongliangabcd@gmail.com> > > > > The function tv_probe does not need to invoke kfree when the > > allocation fails. So let's simplify the code of tv_probe. > > Another change is to remove a redundant space. > > Those are two different things, please resend as a patch series of 2 > different patches. Sure, I have sent the patch series. > > thanks, > > greg k-h
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c index 26baba3ab7d7..30d4d774d448 100644 --- a/drivers/usb/misc/trancevibrator.c +++ b/drivers/usb/misc/trancevibrator.c @@ -84,29 +84,22 @@ static int tv_probe(struct usb_interface *interface, { struct usb_device *udev = interface_to_usbdev(interface); struct trancevibrator *dev; - int retval; dev = kzalloc(sizeof(struct trancevibrator), GFP_KERNEL); - if (!dev) { - retval = -ENOMEM; - goto error; - } + if (!dev) + return -ENOMEM; dev->udev = usb_get_dev(udev); usb_set_intfdata(interface, dev); return 0; - -error: - kfree(dev); - return retval; } static void tv_disconnect(struct usb_interface *interface) { struct trancevibrator *dev; - dev = usb_get_intfdata (interface); + dev = usb_get_intfdata(interface); usb_set_intfdata(interface, NULL); usb_put_dev(dev->udev); kfree(dev);