diff options
| author | Timur Tabi <timur@freescale.com> | 2007-02-08 11:47:31 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-08 18:20:16 -0500 |
| commit | 8f34f6cfa27ddae8faf10aef986db2fda1ba6791 (patch) | |
| tree | e432fc3c822fd28b987673357147fe846a590252 /arch/powerpc/sysdev/qe_lib | |
| parent | d003e7a1a569501cbe9a5ca14748177498c4893a (diff) | |
[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>
Diffstat (limited to 'arch/powerpc/sysdev/qe_lib')
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/ucc_slow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c b/arch/powerpc/sysdev/qe_lib/ucc_slow.c index 47b56203f4..0e97e5c94f 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 | |||
| 179 | uccs->us_info = us_info; | 179 | uccs->us_info = us_info; |
| 180 | uccs->saved_uccm = 0; | 180 | uccs->saved_uccm = 0; |
| 181 | uccs->p_rx_frame = 0; | 181 | uccs->p_rx_frame = 0; |
| 182 | uccs->us_regs = us_info->us_regs; | 182 | uccs->us_regs = us_info->regs; |
| 183 | us_regs = uccs->us_regs; | 183 | us_regs = uccs->us_regs; |
| 184 | uccs->p_ucce = (u16 *) & (us_regs->ucce); | 184 | uccs->p_ucce = (u16 *) & (us_regs->ucce); |
| 185 | uccs->p_uccm = (u16 *) & (us_regs->uccm); | 185 | 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 | |||
| 206 | uccs->us_pram = qe_muram_addr(uccs->us_pram_offset); | 206 | uccs->us_pram = qe_muram_addr(uccs->us_pram_offset); |
| 207 | 207 | ||
| 208 | /* Init Guemr register */ | 208 | /* Init Guemr register */ |
| 209 | if ((ret = ucc_init_guemr((struct ucc_common *) (us_info->us_regs)))) { | 209 | if ((ret = ucc_init_guemr((struct ucc_common *) (us_info->regs)))) { |
| 210 | uccs_err("ucc_slow_init: Could not init the guemr register."); | 210 | uccs_err("ucc_slow_init: Could not init the guemr register."); |
| 211 | ucc_slow_free(uccs); | 211 | ucc_slow_free(uccs); |
| 212 | return ret; | 212 | return ret; |
| @@ -214,7 +214,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc | |||
| 214 | 214 | ||
| 215 | /* Set UCC to slow type */ | 215 | /* Set UCC to slow type */ |
| 216 | if ((ret = ucc_set_type(us_info->ucc_num, | 216 | if ((ret = ucc_set_type(us_info->ucc_num, |
| 217 | (struct ucc_common *) (us_info->us_regs), | 217 | (struct ucc_common *) (us_info->regs), |
| 218 | UCC_SPEED_TYPE_SLOW))) { | 218 | UCC_SPEED_TYPE_SLOW))) { |
| 219 | uccs_err("ucc_slow_init: Could not init the guemr register."); | 219 | uccs_err("ucc_slow_init: Could not init the guemr register."); |
| 220 | ucc_slow_free(uccs); | 220 | ucc_slow_free(uccs); |
