2013-07-24 14:09:11

by Rupesh Gujare

Subject: [PATCH] staging: ozwpan: Fix coding style.

This patch fixes coding style issues reported by Dan here:-
http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2012-June/027767.html

Signed-off-by: Rupesh Gujare <[email protected]>
---
drivers/staging/ozwpan/ozcdev.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/ozwpan/ozcdev.c b/drivers/staging/ozwpan/ozcdev.c
index 3e29760..73b582c 100644
--- a/drivers/staging/ozwpan/ozcdev.c
+++ b/drivers/staging/ozwpan/ozcdev.c
@@ -333,10 +333,11 @@ int oz_cdev_register(void)
{
int err;
struct device *dev;
+
memset(&g_cdev, 0, sizeof(g_cdev));
err = alloc_chrdev_region(&g_cdev.devnum, 0, 1, "ozwpan");
if (err < 0)
- goto out3;
+ return err;
oz_dbg(ON, "Alloc dev number %d:%d\n",
MAJOR(g_cdev.devnum), MINOR(g_cdev.devnum));
cdev_init(&g_cdev.cdev, &oz_fops);
@@ -347,26 +348,26 @@ int oz_cdev_register(void)
err = cdev_add(&g_cdev.cdev, g_cdev.devnum, 1);
if (err < 0) {
oz_dbg(ON, "Failed to add cdev\n");
- goto out2;
+ goto unregister;
}
g_oz_class = class_create(THIS_MODULE, "ozmo_wpan");
if (IS_ERR(g_oz_class)) {
oz_dbg(ON, "Failed to register ozmo_wpan class\n");
err = PTR_ERR(g_oz_class);
- goto out1;
+ goto delete;
}
dev = device_create(g_oz_class, NULL, g_cdev.devnum, NULL, "ozwpan");
if (IS_ERR(dev)) {
oz_dbg(ON, "Failed to create sysfs entry for cdev\n");
err = PTR_ERR(dev);
- goto out1;
+ goto delete;
}
return 0;
-out1:
+
+delete:
cdev_del(&g_cdev.cdev);
-out2:
+unregister:
unregister_chrdev_region(g_cdev.devnum, 1);
-out3:
return err;
}
/*------------------------------------------------------------------------------
--
1.7.9.5

2013-07-25 09:30:46

by Rupesh Gujare

Subject: Re: [PATCH] staging: ozwpan: Fix coding style.

On 24/07/13 15:06, Rupesh Gujare wrote:
> This patch fixes coding style issues reported by Dan here:-
> http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2012-June/027767.html
>
> Signed-off-by: Rupesh Gujare <[email protected]>
> ---
> drivers/staging/ozwpan/ozcdev.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/ozwpan/ozcdev.c b/drivers/staging/ozwpan/ozcdev.c
> index 3e29760..73b582c 100644
> --- a/drivers/staging/ozwpan/ozcdev.c
> +++ b/drivers/staging/ozwpan/ozcdev.c
> @@ -333,10 +333,11 @@ int oz_cdev_register(void)
> {
> int err;
> struct device *dev;
> +
> memset(&g_cdev, 0, sizeof(g_cdev));
> err = alloc_chrdev_region(&g_cdev.devnum, 0, 1, "ozwpan");
> if (err < 0)
> - goto out3;
> + return err;
> oz_dbg(ON, "Alloc dev number %d:%d\n",
> MAJOR(g_cdev.devnum), MINOR(g_cdev.devnum));
> cdev_init(&g_cdev.cdev, &oz_fops);
> @@ -347,26 +348,26 @@ int oz_cdev_register(void)
> err = cdev_add(&g_cdev.cdev, g_cdev.devnum, 1);
> if (err < 0) {
> oz_dbg(ON, "Failed to add cdev\n");
> - goto out2;
> + goto unregister;
> }
> g_oz_class = class_create(THIS_MODULE, "ozmo_wpan");
> if (IS_ERR(g_oz_class)) {
> oz_dbg(ON, "Failed to register ozmo_wpan class\n");
> err = PTR_ERR(g_oz_class);
> - goto out1;
> + goto delete;
> }
> dev = device_create(g_oz_class, NULL, g_cdev.devnum, NULL, "ozwpan");
> if (IS_ERR(dev)) {
> oz_dbg(ON, "Failed to create sysfs entry for cdev\n");
> err = PTR_ERR(dev);
> - goto out1;
> + goto delete;
> }
> return 0;
> -out1:
> +
> +delete:
> cdev_del(&g_cdev.cdev);
> -out2:
> +unregister:
> unregister_chrdev_region(g_cdev.devnum, 1);
> -out3:
> return err;
> }
> /*------------------------------------------------------------------------------
Greg,

Did you missed this patch ? Or did I made another mistake. :( ?

--
Regards,
Rupesh Gujare

2013-07-25 10:40:10

by Dan Carpenter

Subject: Re: [PATCH] staging: ozwpan: Fix coding style.

On Thu, Jul 25, 2013 at 10:30:30AM +0100, Rupesh Gujare wrote:
> Greg,
>
> Did you missed this patch ? Or did I made another mistake. :( ?
>

Chillax. It has only been one day. Ask again after two or three
weeks.

regards,
dan carpenter

2013-07-25 11:04:33

by Rupesh Gujare

Subject: Re: [PATCH] staging: ozwpan: Fix coding style.

On 25/07/13 11:39, Dan Carpenter wrote:
> On Thu, Jul 25, 2013 at 10:30:30AM +0100, Rupesh Gujare wrote:
>> Greg,
>>
>> Did you missed this patch ? Or did I made another mistake. :( ?
>>
> Chillax. It has only been one day. Ask again after two or three
> weeks.
>
>

All right Dan,

Probably I was getting too impatient, while watching that other patches
in queue are getting pulled in. :(

--
Regards,
Rupesh Gujare