diff options
-rw-r--r-- | arch/powerpc/sysdev/qe_lib/ucc_slow.c | 6 | ||||
-rw-r--r-- | include/asm-powerpc/ucc_slow.h | 2 |
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 | |||
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); |
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 { | |||
150 | int ucc_num; | 150 | int ucc_num; |
151 | enum qe_clock rx_clock; | 151 | enum qe_clock rx_clock; |
152 | enum qe_clock tx_clock; | 152 | enum qe_clock tx_clock; |
153 | struct ucc_slow *us_regs; | 153 | struct ucc_slow *regs; |
154 | int irq; | 154 | int irq; |
155 | u16 uccm_mask; | 155 | u16 uccm_mask; |
156 | int data_mem_part; | 156 | int data_mem_part; |