Subject: [PATCH] staging: i2o: Remove unwanted semicolon

This patch removes unwanted semicolon around close braces of code blocks

Signed-off-by: Hari Prasath <[email protected]>
---
drivers/staging/i2o/iop.c | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
index 23bdbe4..18dcc34 100644
--- a/drivers/staging/i2o/iop.c
+++ b/drivers/staging/i2o/iop.c
@@ -75,7 +75,7 @@ struct i2o_message *i2o_msg_get_wait(struct i2o_controller *c, int wait)
}

return msg;
-};
+}

#if BITS_PER_LONG == 64
/**
@@ -123,7 +123,7 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
osm_debug("%s: Add context to list %p -> %d\n", c->name, ptr, context);

return entry->context;
-};
+}

/**
* i2o_cntxt_list_remove - Remove a pointer from the context list
@@ -159,7 +159,7 @@ u32 i2o_cntxt_list_remove(struct i2o_controller * c, void *ptr)
context, ptr);

return context;
-};
+}

/**
* i2o_cntxt_list_get - Get a pointer from the context list and remove it
@@ -192,7 +192,7 @@ void *i2o_cntxt_list_get(struct i2o_controller *c, u32 context)
ptr);

return ptr;
-};
+}

/**
* i2o_cntxt_list_get_ptr - Get a context id from the context list
@@ -224,7 +224,7 @@ u32 i2o_cntxt_list_get_ptr(struct i2o_controller * c, void *ptr)
ptr, context);

return context;
-};
+}
#endif

/**
@@ -245,7 +245,7 @@ struct i2o_controller *i2o_find_iop(int unit)
}

return NULL;
-};
+}

/**
* i2o_iop_find_device - Find a I2O device on an I2O controller
@@ -266,7 +266,7 @@ struct i2o_device *i2o_iop_find_device(struct i2o_controller *c, u16 tid)
return dev;

return NULL;
-};
+}

/**
* i2o_quiesce_controller - quiesce controller
@@ -308,7 +308,7 @@ static int i2o_iop_quiesce(struct i2o_controller *c)
i2o_status_get(c); // Entered READY state

return rc;
-};
+}

/**
* i2o_iop_enable - move controller from ready to OPERATIONAL
@@ -348,7 +348,7 @@ static int i2o_iop_enable(struct i2o_controller *c)
i2o_status_get(c); // entered OPERATIONAL state

return rc;
-};
+}

/**
* i2o_iop_quiesce_all - Quiesce all I2O controllers on the system
@@ -363,7 +363,7 @@ static inline void i2o_iop_quiesce_all(void)
if (!c->no_quiesce)
i2o_iop_quiesce(c);
}
-};
+}

/**
* i2o_iop_enable_all - Enables all controllers on the system
@@ -376,7 +376,7 @@ static inline void i2o_iop_enable_all(void)

list_for_each_entry_safe(c, tmp, &i2o_controllers, list)
i2o_iop_enable(c);
-};
+}

/**
* i2o_clear_controller - Bring I2O controller into HOLD state
@@ -581,7 +581,7 @@ static int i2o_iop_reset(struct i2o_controller *c)
i2o_iop_enable_all();

return rc;
-};
+}

/**
* i2o_iop_activate - Bring controller up to HOLD
@@ -650,7 +650,7 @@ static int i2o_iop_activate(struct i2o_controller *c)
}

return i2o_hrt_get(c);
-};
+}

static void i2o_res_alloc(struct i2o_controller *c, unsigned long flags)
{
@@ -779,7 +779,7 @@ static int i2o_iop_online(struct i2o_controller *c)
return rc;

return 0;
-};
+}

/**
* i2o_iop_remove - Remove the I2O controller from the I2O core
@@ -891,7 +891,7 @@ static int i2o_systab_build(void)
systab->num_entries = count;

return 0;
-};
+}

/**
* i2o_parse_hrt - Parse the hardware resource table.
@@ -905,7 +905,7 @@ static int i2o_parse_hrt(struct i2o_controller *c)
{
i2o_dump_hrt(c);
return 0;
-};
+}

/**
* i2o_status_get - Get the status block from the I2O controller
@@ -1029,7 +1029,7 @@ static void i2o_iop_release(struct device *dev)
struct i2o_controller *c = to_i2o_controller(dev);

i2o_iop_free(c);
-};
+}

/**
* i2o_iop_alloc - Allocate and initialize a i2o_controller struct
@@ -1062,7 +1062,7 @@ struct i2o_controller *i2o_iop_alloc(void)
I2O_MSG_INPOOL_MIN)) {
kfree(c);
return ERR_PTR(-ENOMEM);
- };
+ }

INIT_LIST_HEAD(&c->devices);
spin_lock_init(&c->lock);
@@ -1081,7 +1081,7 @@ struct i2o_controller *i2o_iop_alloc(void)
#endif

return c;
-};
+}

/**
* i2o_iop_add - Initialize the I2O controller and add him to the I2O core
@@ -1145,7 +1145,7 @@ int i2o_iop_add(struct i2o_controller *c)
i2o_iop_reset(c);

return rc;
-};
+}

/**
* i2o_event_register - Turn on/off event notification for a I2O device
@@ -1181,7 +1181,7 @@ int i2o_event_register(struct i2o_device *dev, struct i2o_driver *drv,
i2o_msg_post(c, msg);

return 0;
-};
+}

/**
* i2o_iop_init - I2O main initialization function
@@ -1231,7 +1231,7 @@ static void __exit i2o_iop_exit(void)
i2o_pci_exit();
i2o_exec_exit();
i2o_driver_exit();
-};
+}

module_init(i2o_iop_init);
module_exit(i2o_iop_exit);
--
1.9.1


2015-04-23 15:09:38

by Alan

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

On Thu, 2015-04-23 at 13:43 +0000, Gujulan Elango, Hari Prasath (H.)
wrote:
> This patch removes unwanted semicolon around close braces of code blocks


The i2o driver moved into staging ready to be deleted unless someone
steps up with hardware willing to maintain it (which is rather
unlikely).

Nothing wrong with removing all those semi-colons or the submission,
it's just you are patching something going away!

Thanks for the patch though - and better luck next time 8)

Alan

2015-04-30 14:14:15

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

On Thu, Apr 23, 2015 at 04:09:28PM +0100, Alan Cox wrote:
> On Thu, 2015-04-23 at 13:43 +0000, Gujulan Elango, Hari Prasath (H.)
> wrote:
> > This patch removes unwanted semicolon around close braces of code blocks
>
>
> The i2o driver moved into staging ready to be deleted unless someone
> steps up with hardware willing to maintain it (which is rather
> unlikely).

I think it's now time to delete these, want me to do that for 4.2? I
can queue that up in my tree now, so that we don't see any more cleanup
patches being made for them?

thanks,

greg k-h

2015-04-30 16:35:05

by hari prasath

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

On 30 April 2015 at 19:44, [email protected]
<[email protected]> wrote:
> On Thu, Apr 23, 2015 at 04:09:28PM +0100, Alan Cox wrote:
>> On Thu, 2015-04-23 at 13:43 +0000, Gujulan Elango, Hari Prasath (H.)
>> wrote:
>> > This patch removes unwanted semicolon around close braces of code blocks
>>
>>
>> The i2o driver moved into staging ready to be deleted unless someone
>> steps up with hardware willing to maintain it (which is rather
>> unlikely).
>
> I think it's now time to delete these, want me to do that for 4.2? I
> can queue that up in my tree now, so that we don't see any more cleanup
> patches being made for them?
>
> thanks,
>
> greg k-h
> _______________________________________________
> devel mailing list
> [email protected]
> http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

>>> Greg I am not sure if this needs to go into next release. I send this patch as checkpatch was complaining about it. May be the owners of this driver can only decide >>> upon it. Alan cox also mentioned the same point that its about to be deleted.

--
Regards,
G.E.Hari Prasath

2015-04-30 22:26:20

by Alan Cox

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

On Thu, 30 Apr 2015 16:14:06 +0200
"[email protected]" <[email protected]> wrote:

> On Thu, Apr 23, 2015 at 04:09:28PM +0100, Alan Cox wrote:
> > On Thu, 2015-04-23 at 13:43 +0000, Gujulan Elango, Hari Prasath (H.)
> > wrote:
> > > This patch removes unwanted semicolon around close braces of code blocks
> >
> >
> > The i2o driver moved into staging ready to be deleted unless someone
> > steps up with hardware willing to maintain it (which is rather
> > unlikely).
>
> I think it's now time to delete these, want me to do that for 4.2? I
> can queue that up in my tree now, so that we don't see any more cleanup
> patches being made for them?

Yeah I think it can go....

2015-05-01 07:18:28

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

On Thu, Apr 30, 2015 at 10:05:00PM +0530, hari prasath wrote:
> >>> Greg I am not sure if this needs to go into next release. I send this patch as checkpatch was complaining about it. May be the owners of this driver can only decide >>> upon it. Alan cox also mentioned the same point that its about to be deleted.

When you reply to someone's email then the quoted text should have a
"> " at the start of the line and the new text should not. Please stop
doing it in the reverse way.

regards,
dan carpenter

2015-05-01 07:33:17

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

On Fri, May 01, 2015 at 10:18:14AM +0300, Dan Carpenter wrote:
> On Thu, Apr 30, 2015 at 10:05:00PM +0530, hari prasath wrote:
> > >>> Greg I am not sure if this needs to go into next release. I send this patch as checkpatch was complaining about it. May be the owners of this driver can only decide >>> upon it. Alan cox also mentioned the same point that its about to be deleted.
>

Also please line wrap at 72 characters.

regards,
dan carpenter

2015-05-01 07:41:10

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

On Thu, Apr 30, 2015 at 11:25:48PM +0100, One Thousand Gnomes wrote:
> On Thu, 30 Apr 2015 16:14:06 +0200
> "[email protected]" <[email protected]> wrote:
>
> > On Thu, Apr 23, 2015 at 04:09:28PM +0100, Alan Cox wrote:
> > > On Thu, 2015-04-23 at 13:43 +0000, Gujulan Elango, Hari Prasath (H.)
> > > wrote:
> > > > This patch removes unwanted semicolon around close braces of code blocks
> > >
> > >
> > > The i2o driver moved into staging ready to be deleted unless someone
> > > steps up with hardware willing to maintain it (which is rather
> > > unlikely).
> >
> > I think it's now time to delete these, want me to do that for 4.2? I
> > can queue that up in my tree now, so that we don't see any more cleanup
> > patches being made for them?
>
> Yeah I think it can go....

I was about to delete it, but what about drivers/scsi/dpt/dpti_i2o.* ?
Should that be removed as well?

thanks,

greg k-h

2015-05-01 09:28:08

by Alan

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

On Fri, 2015-05-01 at 09:41 +0200, [email protected] wrote:
> On Thu, Apr 30, 2015 at 11:25:48PM +0100, One Thousand Gnomes wrote:
> > On Thu, 30 Apr 2015 16:14:06 +0200
> > "[email protected]" <[email protected]> wrote:
> >
> > > On Thu, Apr 23, 2015 at 04:09:28PM +0100, Alan Cox wrote:
> > > > On Thu, 2015-04-23 at 13:43 +0000, Gujulan Elango, Hari Prasath (H.)
> > > > wrote:
> > > > > This patch removes unwanted semicolon around close braces of code blocks
> > > >
> > > >
> > > > The i2o driver moved into staging ready to be deleted unless someone
> > > > steps up with hardware willing to maintain it (which is rather
> > > > unlikely).
> > >
> > > I think it's now time to delete these, want me to do that for 4.2? I
> > > can queue that up in my tree now, so that we don't see any more cleanup
> > > patches being made for them?
> >
> > Yeah I think it can go....
>
> I was about to delete it, but what about drivers/scsi/dpt/dpti_i2o.* ?
> Should that be removed as well?

Possibly but that ought to go via staging and really is one for the SCSI
folks to call. The dpt_i2o was a bit more common than i2o proper.

Alan

2015-05-01 14:16:11

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

On Fri, May 01, 2015 at 10:28:00AM +0100, Alan Cox wrote:
> On Fri, 2015-05-01 at 09:41 +0200, [email protected] wrote:
> > On Thu, Apr 30, 2015 at 11:25:48PM +0100, One Thousand Gnomes wrote:
> > > On Thu, 30 Apr 2015 16:14:06 +0200
> > > "[email protected]" <[email protected]> wrote:
> > >
> > > > On Thu, Apr 23, 2015 at 04:09:28PM +0100, Alan Cox wrote:
> > > > > On Thu, 2015-04-23 at 13:43 +0000, Gujulan Elango, Hari Prasath (H.)
> > > > > wrote:
> > > > > > This patch removes unwanted semicolon around close braces of code blocks
> > > > >
> > > > >
> > > > > The i2o driver moved into staging ready to be deleted unless someone
> > > > > steps up with hardware willing to maintain it (which is rather
> > > > > unlikely).
> > > >
> > > > I think it's now time to delete these, want me to do that for 4.2? I
> > > > can queue that up in my tree now, so that we don't see any more cleanup
> > > > patches being made for them?
> > >
> > > Yeah I think it can go....
> >
> > I was about to delete it, but what about drivers/scsi/dpt/dpti_i2o.* ?
> > Should that be removed as well?
>
> Possibly but that ought to go via staging and really is one for the SCSI
> folks to call. The dpt_i2o was a bit more common than i2o proper.

But if the staging i2o core is removed, doesn't that mean that this
driver will stop working? It uses code in uapi i2o.h, which I'm
guessing is implemented in the staging i2o core.

thanks,

greg k-h

2015-05-01 18:54:00

by Alan

[permalink] [raw]
Subject: Re: [PATCH] staging: i2o: Remove unwanted semicolon

> > Possibly but that ought to go via staging and really is one for the SCSI
> > folks to call. The dpt_i2o was a bit more common than i2o proper.
>
> But if the staging i2o core is removed, doesn't that mean that this
> driver will stop working? It uses code in uapi i2o.h, which I'm
> guessing is implemented in the staging i2o core.

They are separate drivers. dpt_i2o intentionally shares some API bits
but they stand alone.

Alan