Re: [PATCH] staging: winbond: phy_calibration.c Coding style fixes 1/2.

[Greg KH <greg@kroah.com>]

On Mon, Mar 22, 2010 at 03:50:18PM +0100, Lars Lindley wrote:
> On 2010-03-22 15:29, Dan Carpenter wrote:
> > On Mon, Mar 22, 2010 at 03:17:26PM +0100, Lars Lindley wrote:
> >> Whitespace and indentation fixes. Removed "commented away"
> >> code and revision comments.
> >> Checked with Dan Carpenters strip_whitespace.pl and diff.
> >> Compiles fine and .o file is identical before and after.
> >>
> > 
> > 	[ snip ]
> > 
> >> -#ifdef _DEBUG
> >> +	/* e. The result are shown in "adc_dc_cal_i[8:0] and adc_dc_cal_q[8:0]" */
> >> +	#ifdef _DEBUG
> >>  	hw_get_dxx_reg(phw_data, REG_OFFSET_READ, &val);
> >>  	PHY_DEBUG(("[CAL]    REG_OFFSET_READ = 0x%08X\n", val));
> >>  
> >>  	PHY_DEBUG(("[CAL]    ** adc_dc_cal_i = %d (0x%04X)\n",
> >> -			   _s9_to_s32(val&0x000001FF), val&0x000001FF));
> >> +			_s9_to_s32(val & 0x000001FF), val & 0x000001FF));
> >>  	PHY_DEBUG(("[CAL]    ** adc_dc_cal_q = %d (0x%04X)\n",
> >> -			   _s9_to_s32((val&0x0003FE00)>>9), (val&0x0003FE00)>>9));
> >> -#endif
> >> +			_s9_to_s32((val & 0x0003FE00) >> 9), (val & 0x0003FE00) >> 9));
> >> +	#endif
> >>  
> > 
> > #ifdef and #endif shouldn't be indented.
> > 
> > I'm really happy that you're using my script.  It feels more relaxing to 
> > review these when I know that no bugs were introduced.
> > 
> > regard,
> > dan carpenter
> > 
> 
> Hi Dan.
> 
> It feels good to me to.
> When you sit with repetitive editing for a couple of hours you're
> bound to make a mistake or two. :)
> 
> I made a new patch that applies after these two that fixes the indentation.
> When we have acks for all the parts I can combine them into one patch.

Can you merge these together now?

thanks,

greg k-h