[OPW,kernel,v2] staging/cxt1e1:Fixes incorrect brace placement
diff mbox

Message ID 20131003200032.GA16848@dshgna
State Under Review
Headers show

Commit Message

Dulshani Gunawardhana Oct. 3, 2013, 8 p.m. UTC
This patch fixes the error "This open brace { should be on the
above line" detected via checkpatch.pl.

Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Reviewed-by: Zach Brown <zab@redhat.com>
---
 drivers/staging/cxt1e1/comet.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

Comments

Waskiewicz Jr, Peter P Oct. 3, 2013, 8:46 p.m. UTC | #1
On Fri, 2013-10-04 at 01:30 +0530, Dulshani Gunawardhana wrote:
> This patch fixes the error "This open brace { should be on the
> above line" detected via checkpatch.pl.

This fix itself looks good.  A few comments below though on other stuff
I see (that can be fixed with another patch).

> Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
> Reviewed-by: Zach Brown <zab@redhat.com>
> ---
>  drivers/staging/cxt1e1/comet.c | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/staging/cxt1e1/comet.c b/drivers/staging/cxt1e1/comet.c
> index 8cef283..6b3182a 100644
> --- a/drivers/staging/cxt1e1/comet.c
> +++ b/drivers/staging/cxt1e1/comet.c
> @@ -145,8 +145,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
>      /* Enable 8 out of 10 validation */

The comment line above is not indented properly.

>  	 /* t1RBOC enable(BOC:BitOriented Code) */
>  	pci_write_32((u_int32_t *) &comet->t1_rboc_ena, 0x00);
> -	if (isT1mode)
> -	{
> +	if (isT1mode) {
>  		/* IBCD cfg: aka Inband Code Detection ** loopback code length set to */
>  		/* 6 bit down, 5 bit up (assert) */
>  		pci_write_32((u_int32_t *) &comet->ibcd_cfg, 0x04);
> @@ -160,8 +159,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
>      /* 60: t1 ALMI cfg */
>      /* Configure Line Coding */

Comments above here are not indented properly.
 
> -	switch (port_mode)
> -	{
> +	switch (port_mode) {
>  	/* 1 - T1 B8ZS */
>  	case CFG_FRAME_SF:
>  		pci_write_32((u_int32_t *) &comet->cdrc_cfg, 0);
> @@ -287,8 +285,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
>  
>      /* 0x30: "BRIF cfg"; 0x20 is 'CMODE', 0x03 is (bit) rate */
>      /* note "rate bits can only be set once after reset" */

Ditto

> -	if (clockmaster)
> -		{
> +	if (clockmaster) {
>  		/* CMODE == clockMode, 0=clock master (so all 3 others should be slave) */
>  		/* rate = 1.544 Mb/s */
>  		if (isT1mode)
> @@ -303,8 +300,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
>  
>  		/* Master Mode i.e.FPMODE=0 (@0x20) */
>  		pci_write_32((u_int32_t *) &comet->brif_fpcfg, 0x00);
> -		if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL)
> -			{
> +		if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL) {
>  			if (cxt1e1_log_level >= LOG_SBEBUG12)
>  				pr_info(">> %s: clockmaster internal clock\n", __func__);
>  			/* internal oscillator */
> @@ -423,8 +419,7 @@ WrtXmtWaveformTbl(ci_t *ci, comet_t *comet,
>  {
>  	u_int32_t sample, unit;
>  
> -	for (sample = 0; sample < COMET_NUM_SAMPLES; sample++)
> -		{
> +	for (sample = 0; sample < COMET_NUM_SAMPLES; sample++) {
>  		for (unit = 0; unit < COMET_NUM_UNITS; unit++)
>  			WrtXmtWaveform(ci, comet, sample, unit, table[sample][unit]);
>  		}
> @@ -555,8 +550,7 @@ SetCometOps(comet_t *comet)
>  {
>  	volatile u_int8_t rd_value;
>  
> -	if (comet == mConfig.C4Func1Base + (COMET0_OFFSET >> 2))
> -	{
> +	if (comet == mConfig.C4Func1Base + (COMET0_OFFSET >> 2)) {
>  		/* read the BRIF Configuration */
>  		rd_value = (u_int8_t) pci_read_32((u_int32_t *) &comet->brif_cfg);
>  		rd_value &= ~0x20;
> -- 
> 1.8.1.2
>
Greg Kroah-Hartman Oct. 3, 2013, 9:26 p.m. UTC | #2
On Fri, Oct 04, 2013 at 01:30:37AM +0530, Dulshani Gunawardhana wrote:
> This patch fixes the error "This open brace { should be on the
> above line" detected via checkpatch.pl.
> 
> Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
> Reviewed-by: Zach Brown <zab@redhat.com>
> ---
>  drivers/staging/cxt1e1/comet.c | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)

Looks great, I'll queue this one up in a bit and you will get an
automated email about it.

thanks,

greg k-h
Greg KH Oct. 3, 2013, 9:29 p.m. UTC | #3
On Fri, Oct 04, 2013 at 01:30:37AM +0530, Dulshani Gunawardhana wrote:
> This patch fixes the error "This open brace { should be on the
> above line" detected via checkpatch.pl.
> 
> Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
> Reviewed-by: Zach Brown <zab@redhat.com>
> ---
>  drivers/staging/cxt1e1/comet.c | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)

Oops, sorry, I can't apply it:
	checking file drivers/staging/cxt1e1/comet.c
	Hunk #1 FAILED at 145.
	Hunk #2 succeeded at 161 (offset 1 line).
	Hunk #3 succeeded at 287 (offset 1 line).
	Hunk #4 succeeded at 302 (offset 1 line).
	Hunk #5 succeeded at 421 (offset 1 line).
	Hunk #6 succeeded at 552 (offset 1 line).
	1 out of 6 hunks FAILED

What kernel tree did you make this patch against?  You should be doing
it against the linux-next tree, not Linus's tree.

Can you refresh it against that tree and resend it?

thanks,

greg k-h
Josh Triplett Oct. 3, 2013, 10:39 p.m. UTC | #4
Very minor nit: your commit messages should be written in imperative
tense: "Fix incorrrect brace placement".  Don't say "This patch fixes",
just say "Fix".  Write your commit messages as though you're commanding
the kernel to be better. :)

Not essential, and not something you need to fix for this patch, just a
general style guideline.

- Josh Triplett

On Fri, Oct 04, 2013 at 01:30:37AM +0530, Dulshani Gunawardhana wrote:
> This patch fixes the error "This open brace { should be on the
> above line" detected via checkpatch.pl.
> 
> Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
> Reviewed-by: Zach Brown <zab@redhat.com>
> ---
>  drivers/staging/cxt1e1/comet.c | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/staging/cxt1e1/comet.c b/drivers/staging/cxt1e1/comet.c
> index 8cef283..6b3182a 100644
> --- a/drivers/staging/cxt1e1/comet.c
> +++ b/drivers/staging/cxt1e1/comet.c
> @@ -145,8 +145,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
>      /* Enable 8 out of 10 validation */
>  	 /* t1RBOC enable(BOC:BitOriented Code) */
>  	pci_write_32((u_int32_t *) &comet->t1_rboc_ena, 0x00);
> -	if (isT1mode)
> -	{
> +	if (isT1mode) {
>  		/* IBCD cfg: aka Inband Code Detection ** loopback code length set to */
>  		/* 6 bit down, 5 bit up (assert) */
>  		pci_write_32((u_int32_t *) &comet->ibcd_cfg, 0x04);
> @@ -160,8 +159,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
>      /* 60: t1 ALMI cfg */
>      /* Configure Line Coding */
>  
> -	switch (port_mode)
> -	{
> +	switch (port_mode) {
>  	/* 1 - T1 B8ZS */
>  	case CFG_FRAME_SF:
>  		pci_write_32((u_int32_t *) &comet->cdrc_cfg, 0);
> @@ -287,8 +285,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
>  
>      /* 0x30: "BRIF cfg"; 0x20 is 'CMODE', 0x03 is (bit) rate */
>      /* note "rate bits can only be set once after reset" */
> -	if (clockmaster)
> -		{
> +	if (clockmaster) {
>  		/* CMODE == clockMode, 0=clock master (so all 3 others should be slave) */
>  		/* rate = 1.544 Mb/s */
>  		if (isT1mode)
> @@ -303,8 +300,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
>  
>  		/* Master Mode i.e.FPMODE=0 (@0x20) */
>  		pci_write_32((u_int32_t *) &comet->brif_fpcfg, 0x00);
> -		if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL)
> -			{
> +		if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL) {
>  			if (cxt1e1_log_level >= LOG_SBEBUG12)
>  				pr_info(">> %s: clockmaster internal clock\n", __func__);
>  			/* internal oscillator */
> @@ -423,8 +419,7 @@ WrtXmtWaveformTbl(ci_t *ci, comet_t *comet,
>  {
>  	u_int32_t sample, unit;
>  
> -	for (sample = 0; sample < COMET_NUM_SAMPLES; sample++)
> -		{
> +	for (sample = 0; sample < COMET_NUM_SAMPLES; sample++) {
>  		for (unit = 0; unit < COMET_NUM_UNITS; unit++)
>  			WrtXmtWaveform(ci, comet, sample, unit, table[sample][unit]);
>  		}
> @@ -555,8 +550,7 @@ SetCometOps(comet_t *comet)
>  {
>  	volatile u_int8_t rd_value;
>  
> -	if (comet == mConfig.C4Func1Base + (COMET0_OFFSET >> 2))
> -	{
> +	if (comet == mConfig.C4Func1Base + (COMET0_OFFSET >> 2)) {
>  		/* read the BRIF Configuration */
>  		rd_value = (u_int8_t) pci_read_32((u_int32_t *) &comet->brif_cfg);
>  		rd_value &= ~0x20;
> -- 
> 1.8.1.2
> 
> -- 
> You received this message because you are subscribed to the Google Groups "opw-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to opw-kernel+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
Dulshani Gunawardhana Oct. 4, 2013, 3:07 a.m. UTC | #5
Hi Greg, I submitted this after another small submission to cxt1e1. I have
not received a review on it, so I think it may have been overlooked.
https://groups.google.com/forum/#!topic/opw-kernel/ut0XjA4brYc .

Thank you Peter, Greg and Josh for your feedback.




On 4 October 2013 04:09, Josh Triplett <josh@joshtriplett.org> wrote:

> Very minor nit: your commit messages should be written in imperative
> tense: "Fix incorrrect brace placement".  Don't say "This patch fixes",
> just say "Fix".  Write your commit messages as though you're commanding
> the kernel to be better. :)
>
> Not essential, and not something you need to fix for this patch, just a
> general style guideline.
>
> - Josh Triplett
>
> On Fri, Oct 04, 2013 at 01:30:37AM +0530, Dulshani Gunawardhana wrote:
> > This patch fixes the error "This open brace { should be on the
> > above line" detected via checkpatch.pl.
> >
> > Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
> > Reviewed-by: Zach Brown <zab@redhat.com>
> > ---
> >  drivers/staging/cxt1e1/comet.c | 18 ++++++------------
> >  1 file changed, 6 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/staging/cxt1e1/comet.c
> b/drivers/staging/cxt1e1/comet.c
> > index 8cef283..6b3182a 100644
> > --- a/drivers/staging/cxt1e1/comet.c
> > +++ b/drivers/staging/cxt1e1/comet.c
> > @@ -145,8 +145,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t
> port_mode, int clockmaster,
> >      /* Enable 8 out of 10 validation */
> >        /* t1RBOC enable(BOC:BitOriented Code) */
> >       pci_write_32((u_int32_t *) &comet->t1_rboc_ena, 0x00);
> > -     if (isT1mode)
> > -     {
> > +     if (isT1mode) {
> >               /* IBCD cfg: aka Inband Code Detection ** loopback code
> length set to */
> >               /* 6 bit down, 5 bit up (assert) */
> >               pci_write_32((u_int32_t *) &comet->ibcd_cfg, 0x04);
> > @@ -160,8 +159,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t
> port_mode, int clockmaster,
> >      /* 60: t1 ALMI cfg */
> >      /* Configure Line Coding */
> >
> > -     switch (port_mode)
> > -     {
> > +     switch (port_mode) {
> >       /* 1 - T1 B8ZS */
> >       case CFG_FRAME_SF:
> >               pci_write_32((u_int32_t *) &comet->cdrc_cfg, 0);
> > @@ -287,8 +285,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t
> port_mode, int clockmaster,
> >
> >      /* 0x30: "BRIF cfg"; 0x20 is 'CMODE', 0x03 is (bit) rate */
> >      /* note "rate bits can only be set once after reset" */
> > -     if (clockmaster)
> > -             {
> > +     if (clockmaster) {
> >               /* CMODE == clockMode, 0=clock master (so all 3 others
> should be slave) */
> >               /* rate = 1.544 Mb/s */
> >               if (isT1mode)
> > @@ -303,8 +300,7 @@ void init_comet(void *ci, comet_t *comet, u_int32_t
> port_mode, int clockmaster,
> >
> >               /* Master Mode i.e.FPMODE=0 (@0x20) */
> >               pci_write_32((u_int32_t *) &comet->brif_fpcfg, 0x00);
> > -             if ((moreParams & CFG_CLK_PORT_MASK) ==
> CFG_CLK_PORT_INTERNAL)
> > -                     {
> > +             if ((moreParams & CFG_CLK_PORT_MASK) ==
> CFG_CLK_PORT_INTERNAL) {
> >                       if (cxt1e1_log_level >= LOG_SBEBUG12)
> >                               pr_info(">> %s: clockmaster internal
> clock\n", __func__);
> >                       /* internal oscillator */
> > @@ -423,8 +419,7 @@ WrtXmtWaveformTbl(ci_t *ci, comet_t *comet,
> >  {
> >       u_int32_t sample, unit;
> >
> > -     for (sample = 0; sample < COMET_NUM_SAMPLES; sample++)
> > -             {
> > +     for (sample = 0; sample < COMET_NUM_SAMPLES; sample++) {
> >               for (unit = 0; unit < COMET_NUM_UNITS; unit++)
> >                       WrtXmtWaveform(ci, comet, sample, unit,
> table[sample][unit]);
> >               }
> > @@ -555,8 +550,7 @@ SetCometOps(comet_t *comet)
> >  {
> >       volatile u_int8_t rd_value;
> >
> > -     if (comet == mConfig.C4Func1Base + (COMET0_OFFSET >> 2))
> > -     {
> > +     if (comet == mConfig.C4Func1Base + (COMET0_OFFSET >> 2)) {
> >               /* read the BRIF Configuration */
> >               rd_value = (u_int8_t) pci_read_32((u_int32_t *)
> &comet->brif_cfg);
> >               rd_value &= ~0x20;
> > --
> > 1.8.1.2
> >
> > --
> > You received this message because you are subscribed to the Google
> Groups "opw-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send
> an email to opw-kernel+unsubscribe@googlegroups.com.
> > For more options, visit https://groups.google.com/groups/opt_out.
>
Greg Kroah-Hartman Oct. 4, 2013, 3:17 a.m. UTC | #6
On Fri, Oct 04, 2013 at 08:37:04AM +0530, Dulshani Gunawardhana wrote:
> Hi Greg, I submitted this after another small submission to cxt1e1. I have
> not received a review on it, so I think it may have been overlooked.
> https://groups.google.com/forum/#!topic/opw-kernel/ut0XjA4brYc .

Ah, yes it was, sorry about that, my fault, I saw the "v2" of your other
patch and missed that this was a different one.

greg k-h
Dulshani Gunawardhana Oct. 4, 2013, 1:23 p.m. UTC | #7
I think this should work after that is applied. Does it? :)


On 4 October 2013 08:47, Greg KH <gregkh@linuxfoundation.org> wrote:

> On Fri, Oct 04, 2013 at 08:37:04AM +0530, Dulshani Gunawardhana wrote:
> > Hi Greg, I submitted this after another small submission to cxt1e1. I
> have
> > not received a review on it, so I think it may have been overlooked.
> > https://groups.google.com/forum/#!topic/opw-kernel/ut0XjA4brYc .
>
> Ah, yes it was, sorry about that, my fault, I saw the "v2" of your other
> patch and missed that this was a different one.
>
> greg k-h
>
Greg Kroah-Hartman Oct. 4, 2013, 1:29 p.m. UTC | #8
On Fri, Oct 04, 2013 at 06:53:54PM +0530, Dulshani Gunawardhana wrote:
> I think this should work after that is applied. Does it? :)

That's too many pronouns, I don't know what you are talking about here,
sorry.

greg k-h
Dulshani Gunawardhana Oct. 4, 2013, 1:42 p.m. UTC | #9
sorry :).
After the previous patch (the one fixing the indentation) is applied, I
think this patch works. Is it so?


On 4 October 2013 18:59, Greg KH <gregkh@linuxfoundation.org> wrote:

> On Fri, Oct 04, 2013 at 06:53:54PM +0530, Dulshani Gunawardhana wrote:
> > I think this should work after that is applied. Does it? :)
>
> That's too many pronouns, I don't know what you are talking about here,
> sorry.
>
> greg k-h
>
Greg Kroah-Hartman Oct. 6, 2013, 12:43 a.m. UTC | #10
A: No.
Q: Should I include quotations after my reply?

http://daringfireball.net/2007/07/on_top

On Fri, Oct 04, 2013 at 07:12:49PM +0530, Dulshani Gunawardhana wrote:
> sorry :).
> After the previous patch (the one fixing the indentation) is applied, I think
> this patch works. Is it so?

I think it should, but given that I don't have the hardware to test, I
really don't know for sure.  I wouldn't worry about it, the patch looked
"correct", which is all that really matters.

thanks,

greg k-h
Sarah Sharp Oct. 7, 2013, 3:24 p.m. UTC | #11
On Thu, Oct 03, 2013 at 02:29:46PM -0700, Greg KH wrote:
> On Fri, Oct 04, 2013 at 01:30:37AM +0530, Dulshani Gunawardhana wrote:
> > This patch fixes the error "This open brace { should be on the
> > above line" detected via checkpatch.pl.
> > 
> > Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
> > Reviewed-by: Zach Brown <zab@redhat.com>
> > ---
> >  drivers/staging/cxt1e1/comet.c | 18 ++++++------------
> >  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> Oops, sorry, I can't apply it:
> 	checking file drivers/staging/cxt1e1/comet.c
> 	Hunk #1 FAILED at 145.
> 	Hunk #2 succeeded at 161 (offset 1 line).
> 	Hunk #3 succeeded at 287 (offset 1 line).
> 	Hunk #4 succeeded at 302 (offset 1 line).
> 	Hunk #5 succeeded at 421 (offset 1 line).
> 	Hunk #6 succeeded at 552 (offset 1 line).
> 	1 out of 6 hunks FAILED
> 
> What kernel tree did you make this patch against?  You should be doing
> it against the linux-next tree, not Linus's tree.

Should we have all applicants working with linux-next?  The tutorial
asks them to clone Linus' tree.

Sarah Sharp
Greg Kroah-Hartman Oct. 7, 2013, 8:25 p.m. UTC | #12
On Mon, Oct 07, 2013 at 08:24:57AM -0700, Sarah Sharp wrote:
> On Thu, Oct 03, 2013 at 02:29:46PM -0700, Greg KH wrote:
> > On Fri, Oct 04, 2013 at 01:30:37AM +0530, Dulshani Gunawardhana wrote:
> > > This patch fixes the error "This open brace { should be on the
> > > above line" detected via checkpatch.pl.
> > > 
> > > Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
> > > Reviewed-by: Zach Brown <zab@redhat.com>
> > > ---
> > >  drivers/staging/cxt1e1/comet.c | 18 ++++++------------
> > >  1 file changed, 6 insertions(+), 12 deletions(-)
> > 
> > Oops, sorry, I can't apply it:
> > 	checking file drivers/staging/cxt1e1/comet.c
> > 	Hunk #1 FAILED at 145.
> > 	Hunk #2 succeeded at 161 (offset 1 line).
> > 	Hunk #3 succeeded at 287 (offset 1 line).
> > 	Hunk #4 succeeded at 302 (offset 1 line).
> > 	Hunk #5 succeeded at 421 (offset 1 line).
> > 	Hunk #6 succeeded at 552 (offset 1 line).
> > 	1 out of 6 hunks FAILED
> > 
> > What kernel tree did you make this patch against?  You should be doing
> > it against the linux-next tree, not Linus's tree.
> 
> Should we have all applicants working with linux-next?  The tutorial
> asks them to clone Linus' tree.

Linus's tree is good for the first patch, sometimes.  But once you get
into fixing multiple things, and relying on a previous patch to be
applied, you really need to either use linux-next, or my staging-next
branch of my staging.git tree, so as to not duplicate work, and create
patches that can't be accepted.

So something should be said in the tutorial somewhere about this.  As
I'm on the road at the moment, with limited internet access, I can't
edit it myself, sorry.

greg k-h
Maria Soler Heredia Oct. 8, 2013, 8:08 a.m. UTC | #13
>
> Linus's tree is good for the first patch, sometimes.  But once you get
> into fixing multiple things, and relying on a previous patch to be
> applied, you really need to either use linux-next, or my staging-next
> branch of my staging.git tree, so as to not duplicate work, and create
> patches that can't be accepted.
>
> So something should be said in the tutorial somewhere about this.  As
> I'm on the road at the moment, with limited internet access, I can't
> edit it myself, sorry.
>

So after our first patches we should download  a different branch? Should
we then checkout from here? git://
git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git

Thank you very much for all your patience.

MarĂ­a.
Dulshani Gunawardhana Oct. 21, 2013, 7:41 a.m. UTC | #14
Hi,

Just noticed that this patch has not been applied yet. Shall I resubmit 
as-is from my rebased tree?

Thanks :)


> Linus's tree is good for the first patch, sometimes.  But once you get 
> into fixing multiple things, and relying on a previous patch to be 
> applied, you really need to either use linux-next, or my staging-next 
> branch of my staging.git tree, so as to not duplicate work, and create 
> patches that can't be accepted. 
>
>
Greg Kroah-Hartman Oct. 27, 2013, 2:01 p.m. UTC | #15
On Mon, Oct 21, 2013 at 12:41:22AM -0700, Dulshani Gunawardhana wrote:
> Hi,
> 
> Just noticed that this patch has not been applied yet. Shall I resubmit as-is
> from my rebased tree?

Please do because it is not in my "to-apply" queue.

greg k-h

Patch
diff mbox

diff --git a/drivers/staging/cxt1e1/comet.c b/drivers/staging/cxt1e1/comet.c
index 8cef283..6b3182a 100644
--- a/drivers/staging/cxt1e1/comet.c
+++ b/drivers/staging/cxt1e1/comet.c
@@ -145,8 +145,7 @@  void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
     /* Enable 8 out of 10 validation */
 	 /* t1RBOC enable(BOC:BitOriented Code) */
 	pci_write_32((u_int32_t *) &comet->t1_rboc_ena, 0x00);
-	if (isT1mode)
-	{
+	if (isT1mode) {
 		/* IBCD cfg: aka Inband Code Detection ** loopback code length set to */
 		/* 6 bit down, 5 bit up (assert) */
 		pci_write_32((u_int32_t *) &comet->ibcd_cfg, 0x04);
@@ -160,8 +159,7 @@  void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
     /* 60: t1 ALMI cfg */
     /* Configure Line Coding */
 
-	switch (port_mode)
-	{
+	switch (port_mode) {
 	/* 1 - T1 B8ZS */
 	case CFG_FRAME_SF:
 		pci_write_32((u_int32_t *) &comet->cdrc_cfg, 0);
@@ -287,8 +285,7 @@  void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
 
     /* 0x30: "BRIF cfg"; 0x20 is 'CMODE', 0x03 is (bit) rate */
     /* note "rate bits can only be set once after reset" */
-	if (clockmaster)
-		{
+	if (clockmaster) {
 		/* CMODE == clockMode, 0=clock master (so all 3 others should be slave) */
 		/* rate = 1.544 Mb/s */
 		if (isT1mode)
@@ -303,8 +300,7 @@  void init_comet(void *ci, comet_t *comet, u_int32_t port_mode, int clockmaster,
 
 		/* Master Mode i.e.FPMODE=0 (@0x20) */
 		pci_write_32((u_int32_t *) &comet->brif_fpcfg, 0x00);
-		if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL)
-			{
+		if ((moreParams & CFG_CLK_PORT_MASK) == CFG_CLK_PORT_INTERNAL) {
 			if (cxt1e1_log_level >= LOG_SBEBUG12)
 				pr_info(">> %s: clockmaster internal clock\n", __func__);
 			/* internal oscillator */
@@ -423,8 +419,7 @@  WrtXmtWaveformTbl(ci_t *ci, comet_t *comet,
 {
 	u_int32_t sample, unit;
 
-	for (sample = 0; sample < COMET_NUM_SAMPLES; sample++)
-		{
+	for (sample = 0; sample < COMET_NUM_SAMPLES; sample++) {
 		for (unit = 0; unit < COMET_NUM_UNITS; unit++)
 			WrtXmtWaveform(ci, comet, sample, unit, table[sample][unit]);
 		}
@@ -555,8 +550,7 @@  SetCometOps(comet_t *comet)
 {
 	volatile u_int8_t rd_value;
 
-	if (comet == mConfig.C4Func1Base + (COMET0_OFFSET >> 2))
-	{
+	if (comet == mConfig.C4Func1Base + (COMET0_OFFSET >> 2)) {
 		/* read the BRIF Configuration */
 		rd_value = (u_int8_t) pci_read_32((u_int32_t *) &comet->brif_cfg);
 		rd_value &= ~0x20;