[POWERPC] QE: Rename ucc_slow_info.us_regs to ucc_slow_info.regs

Rename the 'us_regs' field of the ucc_slow_info structure in ucc_slow.h
to just 'regs'.  The equivalent field in the ucc_fast_info structure is
also called 'regs', so this patch makes them comparable, and makes the
code a little easier to read, because there already is a 'us_regs' in
another ucc_slow structure.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
index 47b56203f47e..0e97e5c94f8a 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
@@ -179,7 +179,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
         uccs->us_info = us_info;
         uccs->saved_uccm = 0;
         uccs->p_rx_frame = 0;
-        uccs->us_regs = us_info->us_regs;
+        uccs->us_regs = us_info->regs;
         us_regs = uccs->us_regs;
         uccs->p_ucce = (u16 *) & (us_regs->ucce);
         uccs->p_uccm = (u16 *) & (us_regs->uccm);
@@ -206,7 +206,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
         uccs->us_pram = qe_muram_addr(uccs->us_pram_offset);
 
         /* Init Guemr register */
-        if ((ret = ucc_init_guemr((struct ucc_common *) (us_info->us_regs)))) {
+        if ((ret = ucc_init_guemr((struct ucc_common *) (us_info->regs)))) {
                 uccs_err("ucc_slow_init: Could not init the guemr register.");
                 ucc_slow_free(uccs);
                 return ret;
@@ -214,7 +214,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
 
         /* Set UCC to slow type */
         if ((ret = ucc_set_type(us_info->ucc_num,
-                                (struct ucc_common *) (us_info->us_regs),
+                                (struct ucc_common *) (us_info->regs),
                                 UCC_SPEED_TYPE_SLOW))) {
                 uccs_err("ucc_slow_init: Could not init the guemr register.");
                 ucc_slow_free(uccs);
diff --git a/include/asm-powerpc/ucc_slow.h b/include/asm-powerpc/ucc_slow.h
index ca93bc99237e..1babad99c719 100644
--- a/include/asm-powerpc/ucc_slow.h
+++ b/include/asm-powerpc/ucc_slow.h
@@ -150,7 +150,7 @@ struct ucc_slow_info {
         int ucc_num;
         enum qe_clock rx_clock;
         enum qe_clock tx_clock;
-        struct ucc_slow *us_regs;
+        struct ucc_slow *regs;
         int irq;
         u16 uccm_mask;
         int data_mem_part;