Hi Josh,
On Tue, Dec 18, 2012 at 08:31:20PM -0600, Josh Cartwright wrote:
> On Tue, Dec 18, 2012 at 04:16:33PM -0800, Soren Brinkmann wrote:
> > The acronym PSS is deprecated by Xilinx. The correct term, which is
> > also used in Xilinx documentation is PS (processing system).
> > This is just a search and replace:
> > - s/PSS/PS/g
> > - s/pss/ps/g
> >
> > Signed-off-by: Soren Brinkmann <soren.brinkm...@xilinx.com>
> [..]
> > --- a/arch/arm/mach-zynq/timer.c
> > +++ b/arch/arm/mach-zynq/timer.c
> > @@ -35,17 +35,17 @@
> > * Timer Register Offset Definitions of Timer 1, Increment base address by
> > 4
> > * and use same offsets for Timer 2
> > */
> > -#define XTTCPSS_CLK_CNTRL_OFFSET 0x00 /* Clock Control Reg, RW */
> > -#define XTTCPSS_CNT_CNTRL_OFFSET 0x0C /* Counter Control Reg, RW */
> > -#define XTTCPSS_COUNT_VAL_OFFSET 0x18 /* Counter Value Reg, RO */
> > -#define XTTCPSS_INTR_VAL_OFFSET 0x24 /* Interval Count Reg, RW
> > */
> > -#define XTTCPSS_MATCH_1_OFFSET 0x30 /* Match 1 Value Reg, RW */
> > -#define XTTCPSS_MATCH_2_OFFSET 0x3C /* Match 2 Value Reg, RW */
> > -#define XTTCPSS_MATCH_3_OFFSET 0x48 /* Match 3 Value Reg, RW */
> > -#define XTTCPSS_ISR_OFFSET 0x54 /* Interrupt Status Reg, RO */
> > -#define XTTCPSS_IER_OFFSET 0x60 /* Interrupt Enable Reg, RW */
> > -
> > -#define XTTCPSS_CNT_CNTRL_DISABLE_MASK 0x1
> > +#define XTTCPS_CLK_CNTRL_OFFSET 0x00 /* Clock Control Reg, RW */
> > +#define XTTCPS_CNT_CNTRL_OFFSET 0x0C /* Counter Control Reg, RW */
> > +#define XTTCPS_COUNT_VAL_OFFSET 0x18 /* Counter Value Reg, RO */
> > +#define XTTCPS_INTR_VAL_OFFSET 0x24 /* Interval Count Reg, RW
> > */
> > +#define XTTCPS_MATCH_1_OFFSET 0x30 /* Match 1 Value Reg, RW */
> > +#define XTTCPS_MATCH_2_OFFSET 0x3C /* Match 2 Value Reg, RW */
> > +#define XTTCPS_MATCH_3_OFFSET 0x48 /* Match 3 Value Reg, RW */
> > +#define XTTCPS_ISR_OFFSET 0x54 /* Interrupt Status Reg, RO */
> > +#define XTTCPS_IER_OFFSET 0x60 /* Interrupt Enable Reg, RW */
> > +
> > +#define XTTCPS_CNT_CNTRL_DISABLE_MASK 0x1
> >
> > /* Setup the timers to use pre-scaling, using a fixed value for now that
> > will
> > * work across most input frequency, but it may need to be more dynamic
> > @@ -57,72 +57,72 @@
> > #define CNT_CNTRL_RESET (1<<4)
> >
> > /**
> > - * struct xttcpss_timer - This definition defines local timer structure
> > + * struct xttcps_timer - This definition defines local timer structure
> > *
> > * @base_addr: Base address of timer
> > **/
> > -struct xttcpss_timer {
> > +struct xttcps_timer {
> > void __iomem *base_addr;
> > };
> >
> > -struct xttcpss_timer_clocksource {
> > - struct xttcpss_timer xttc;
> > +struct xttcps_timer_clocksource {
> > + struct xttcps_timer xttc;
> > struct clocksource cs;
> > };
> >
> > -#define to_xttcpss_timer_clksrc(x) \
> > - container_of(x, struct xttcpss_timer_clocksource, cs)
> > +#define to_xttcps_timer_clksrc(x) \
> > + container_of(x, struct xttcps_timer_clocksource, cs)
> >
> > -struct xttcpss_timer_clockevent {
> > - struct xttcpss_timer xttc;
> > +struct xttcps_timer_clockevent {
> > + struct xttcps_timer xttc;
> > struct clock_event_device ce;
> > struct clk *clk;
> > };
> >
> > -#define to_xttcpss_timer_clkevent(x) \
> > - container_of(x, struct xttcpss_timer_clockevent, ce)
> > +#define to_xttcps_timer_clkevent(x) \
> > + container_of(x, struct xttcps_timer_clockevent, ce)
> >
> > /**
> > - * xttcpss_set_interval - Set the timer interval value
> > + * xttcps_set_interval - Set the timer interval value
> > *
> > * @timer: Pointer to the timer instance
> > * @cycles: Timer interval ticks
> > **/
> > -static void xttcpss_set_interval(struct xttcpss_timer *timer,
> > +static void xttcps_set_interval(struct xttcps_timer *timer,
> > unsigned long cycles)
>
> Stylistic nit, but if we're going to be making cosmetic changes of this
> sort, I'd personally like to see the arguments lined up properly:
>
> static void xttcps_set_interval(struct xttcps_timer *timer,
> unsigned long cycles)
I actually don't like that because it's rather high maintenance to align
arguments like this - and keeping them that way. I usually rely on vim with
smartindent set to produce reasonable indent levels.
And reviewing the coding guideline, I'd even say it's not encouraged:
"Descendants are always substantially shorter than the parent and
are placed substantially to the right. The same applies to function
headers with a long argument list."
Thanks,
Soren
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
