staging: lirc: clean error handling in probe()
Subsystems (2)
PATCH v2 1/1 staging: lirc: clean error handling in probe()
From: Dan Carpenter <[email protected]>
We have reorganized the error handling into a simpler and more canonical format.
Additionally we removed extra empty lines, switched to devm_kzalloc(), and substitute 'minor' by 'ret' in the igorplugusb_remote_probe() function.
--- drivers/staging/media/lirc/lirc_igorplugusb.c | 56 +++++++-------------------- 1 file changed, 14 insertions(+), 42 deletions(-)
drivers/staging/media/lirc/lirc_igorplugusb.c +14 -42
@@ -240,10 +240,6 @@ static int unregister_from_lirc(struct igorplug *ir)dprintk (DRIVER_NAME "[%d]: calling lirc_unregister_driver\n" , devnum);lirc_unregister_driver (d->minor); -kfree (d); - ir->d =NULL ; -kfree (ir); -return devnum; }
@@ -377,20 +373,16 @@ static int igorplugusb_remote_poll(void *data, struct lirc_buffer *buf)return -ENODATA ; } - -static int igorplugusb_remote_probe (struct usb_interface *intf,const struct usb_device_id *id) { -struct usb_device *dev =NULL ; +struct usb_device *dev;struct usb_host_interface *idesc =NULL ;struct usb_endpoint_descriptor *ep;struct igorplug *ir =NULL ;struct lirc_driver *driver =NULL ;int devnum, pipe, maxp; -int minor =0 ;char buf[63 ], name[128 ] ="" ; -int mem_failure =0 ;int ret;dprintk (DRIVER_NAME ": usb probe called.\n" );
@@ -416,24 +408,18 @@ static int igorplugusb_remote_probe(struct usb_interface *intf,dprintk (DRIVER_NAME "[%d]: bytes_in_key=%zu maxp=%d\n" , devnum,CODE_LENGTH , maxp); - mem_failure =0 ; - ir =kzalloc (sizeof (struct igorplug ),GFP_KERNEL ); -if (!ir) { - mem_failure =1 ; - goto mem_failure_switch; - } - driver =kzalloc (sizeof (struct lirc_driver ),GFP_KERNEL ); -if (!driver) { - mem_failure =2 ; - goto mem_failure_switch; - } + ir =devm_kzalloc (&intf->dev,sizeof (*ir),GFP_KERNEL ); +if (!ir) +return -ENOMEM ; + + driver =devm_kzalloc (&intf->dev,sizeof (*driver),GFP_KERNEL ); +if (!driver) +return -ENOMEM ; ir->buf_in =usb_alloc_coherent (dev,DEVICE_BUFLEN +DEVICE_HEADERLEN ,GFP_ATOMIC , &ir->dma_in); -if (!ir->buf_in) { - mem_failure =3 ; - goto mem_failure_switch; - } +if (!ir->buf_in) +return -ENOMEM ;strcpy (driver->name,DRIVER_NAME " " ); driver->minor =-1 ;
@@ -449,27 +435,14 @@ static int igorplugusb_remote_probe(struct usb_interface *intf, driver->dev = &intf->dev; driver->owner =THIS_MODULE ; - minor =lirc_register_driver (driver); -if (minor <0 ) - mem_failure =9 ; - -mem_failure_switch: - -switch (mem_failure) { -case 9 : + ret =lirc_register_driver (driver); +if (ret <0 ) {usb_free_coherent (dev,DEVICE_BUFLEN +DEVICE_HEADERLEN , ir->buf_in, ir->dma_in); -case 3 : -kfree (driver); -case 2 : -kfree (ir); -case 1 : -printk (DRIVER_NAME "[%d]: out of memory (code=%d)\n" , - devnum, mem_failure); -return -ENOMEM ; +return ret; } - driver->minor = minor; + driver->minor = ret; ir->d = driver; ir->devnum = devnum; ir->usbdev = dev;
@@ -502,7 +475,6 @@ mem_failure_switch:return 0 ; } -static void igorplugusb_remote_disconnect (struct usb_interface *intf) {struct usb_device *usbdev =interface_to_usbdev (intf);
Signature · 1 line
1.8.3.1
Quoted 10 lines · Andy Shevchenko
From: Dan Carpenter <[email protected]>
We have reorganized the error handling into a simpler and more canonical format.
Additionally we removed extra empty lines, switched to
devm_kzalloc(), and substitute 'minor' by 'ret' in theigorplugusb_remote_probe()function.Signed-off-by Dan Carpenter <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>
I don't want credit for this, because I didn't do the work. Signed-off-by is a legal thing like signing a document... But I have reviewed it and it looks good.
regards,
dan carpenter
Quoted 6 lines · Dan Carpenter
Quoted 5 lines · Andy Shevchenko
From: Dan Carpenter <[email protected]>
We have reorganized the error handling into a simpler and more canonical format.
Quoted 8 lines
Quoted 5 lines
Additionally we removed extra empty lines, switched to
devm_kzalloc(), and substitute 'minor' by 'ret' in theigorplugusb_remote_probe()function.Signed-off-by Dan Carpenter <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>I don't want credit for this, because I didn't do the work. Signed-off-by is a legal thing like signing a document...
I took your patch and modified it, so, you have done some work too. But I could resend a version with my authorship.
Quoted 8 lines
But I
have reviewed it and it looks good.Acked-by Dan Carpenter <[email protected]>regards,
dan carpenter
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Quoted 10 lines · Andy Shevchenko
Quoted 9 lines · Dan Carpenter
Quoted 8 lines · Andy Shevchenko
From: Dan Carpenter <[email protected]>
We have reorganized the error handling into a simpler and more canonical format.
Additionally we removed extra empty lines, switched to
devm_kzalloc(), and substitute 'minor' by 'ret' in theigorplugusb_remote_probe()function.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Signed-off-by Dan Carpenter <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>I don't want credit for this, because I didn't do the work. Signed-off-by is a legal thing like signing a document...
I took your patch and modified it, so, you have done some work too. But I could resend a version with my authorship.
I don't think any of my work survived the re-write, but I'm happy enough to take credit for other people's work. :) Don't bother resending.
regards,
dan carpenter