aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ctxfi/ctsrc.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-08 08:57:57 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-08 08:57:57 -0400
commit514eef9c2a711b4c24b97bb456d39695a6fe1775 (patch)
tree0d98fb13304707682faa56d136249e9177a54932 /sound/pci/ctxfi/ctsrc.c
parent4836ac655410e7f126d316b0be062b38746f7529 (diff)
ALSA: ctxfi - Remove useless initializations and cast
Remove useless variable initializations and cast at the beginning of functions. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi/ctsrc.c')
-rw-r--r--sound/pci/ctxfi/ctsrc.c110
1 files changed, 55 insertions, 55 deletions
diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
index 77e118c5bc97..e1c145d8b702 100644
--- a/sound/pci/ctxfi/ctsrc.c
+++ b/sound/pci/ctxfi/ctsrc.c
@@ -37,9 +37,9 @@ static int (*src_default_config[3])(struct src *) = {
37 37
38static int src_set_state(struct src *src, unsigned int state) 38static int src_set_state(struct src *src, unsigned int state)
39{ 39{
40 struct hw *hw = NULL; 40 struct hw *hw;
41 41
42 hw = (struct hw *)src->rsc.hw; 42 hw = src->rsc.hw;
43 hw->src_set_state(src->rsc.ctrl_blk, state); 43 hw->src_set_state(src->rsc.ctrl_blk, state);
44 44
45 return 0; 45 return 0;
@@ -47,9 +47,9 @@ static int src_set_state(struct src *src, unsigned int state)
47 47
48static int src_set_bm(struct src *src, unsigned int bm) 48static int src_set_bm(struct src *src, unsigned int bm)
49{ 49{
50 struct hw *hw = NULL; 50 struct hw *hw;
51 51
52 hw = (struct hw *)src->rsc.hw; 52 hw = src->rsc.hw;
53 hw->src_set_bm(src->rsc.ctrl_blk, bm); 53 hw->src_set_bm(src->rsc.ctrl_blk, bm);
54 54
55 return 0; 55 return 0;
@@ -57,9 +57,9 @@ static int src_set_bm(struct src *src, unsigned int bm)
57 57
58static int src_set_sf(struct src *src, unsigned int sf) 58static int src_set_sf(struct src *src, unsigned int sf)
59{ 59{
60 struct hw *hw = NULL; 60 struct hw *hw;
61 61
62 hw = (struct hw *)src->rsc.hw; 62 hw = src->rsc.hw;
63 hw->src_set_sf(src->rsc.ctrl_blk, sf); 63 hw->src_set_sf(src->rsc.ctrl_blk, sf);
64 64
65 return 0; 65 return 0;
@@ -67,9 +67,9 @@ static int src_set_sf(struct src *src, unsigned int sf)
67 67
68static int src_set_pm(struct src *src, unsigned int pm) 68static int src_set_pm(struct src *src, unsigned int pm)
69{ 69{
70 struct hw *hw = NULL; 70 struct hw *hw;
71 71
72 hw = (struct hw *)src->rsc.hw; 72 hw = src->rsc.hw;
73 hw->src_set_pm(src->rsc.ctrl_blk, pm); 73 hw->src_set_pm(src->rsc.ctrl_blk, pm);
74 74
75 return 0; 75 return 0;
@@ -77,9 +77,9 @@ static int src_set_pm(struct src *src, unsigned int pm)
77 77
78static int src_set_rom(struct src *src, unsigned int rom) 78static int src_set_rom(struct src *src, unsigned int rom)
79{ 79{
80 struct hw *hw = NULL; 80 struct hw *hw;
81 81
82 hw = (struct hw *)src->rsc.hw; 82 hw = src->rsc.hw;
83 hw->src_set_rom(src->rsc.ctrl_blk, rom); 83 hw->src_set_rom(src->rsc.ctrl_blk, rom);
84 84
85 return 0; 85 return 0;
@@ -87,9 +87,9 @@ static int src_set_rom(struct src *src, unsigned int rom)
87 87
88static int src_set_vo(struct src *src, unsigned int vo) 88static int src_set_vo(struct src *src, unsigned int vo)
89{ 89{
90 struct hw *hw = NULL; 90 struct hw *hw;
91 91
92 hw = (struct hw *)src->rsc.hw; 92 hw = src->rsc.hw;
93 hw->src_set_vo(src->rsc.ctrl_blk, vo); 93 hw->src_set_vo(src->rsc.ctrl_blk, vo);
94 94
95 return 0; 95 return 0;
@@ -97,9 +97,9 @@ static int src_set_vo(struct src *src, unsigned int vo)
97 97
98static int src_set_st(struct src *src, unsigned int st) 98static int src_set_st(struct src *src, unsigned int st)
99{ 99{
100 struct hw *hw = NULL; 100 struct hw *hw;
101 101
102 hw = (struct hw *)src->rsc.hw; 102 hw = src->rsc.hw;
103 hw->src_set_st(src->rsc.ctrl_blk, st); 103 hw->src_set_st(src->rsc.ctrl_blk, st);
104 104
105 return 0; 105 return 0;
@@ -107,9 +107,9 @@ static int src_set_st(struct src *src, unsigned int st)
107 107
108static int src_set_bp(struct src *src, unsigned int bp) 108static int src_set_bp(struct src *src, unsigned int bp)
109{ 109{
110 struct hw *hw = NULL; 110 struct hw *hw;
111 111
112 hw = (struct hw *)src->rsc.hw; 112 hw = src->rsc.hw;
113 hw->src_set_bp(src->rsc.ctrl_blk, bp); 113 hw->src_set_bp(src->rsc.ctrl_blk, bp);
114 114
115 return 0; 115 return 0;
@@ -117,9 +117,9 @@ static int src_set_bp(struct src *src, unsigned int bp)
117 117
118static int src_set_cisz(struct src *src, unsigned int cisz) 118static int src_set_cisz(struct src *src, unsigned int cisz)
119{ 119{
120 struct hw *hw = NULL; 120 struct hw *hw;
121 121
122 hw = (struct hw *)src->rsc.hw; 122 hw = src->rsc.hw;
123 hw->src_set_cisz(src->rsc.ctrl_blk, cisz); 123 hw->src_set_cisz(src->rsc.ctrl_blk, cisz);
124 124
125 return 0; 125 return 0;
@@ -127,9 +127,9 @@ static int src_set_cisz(struct src *src, unsigned int cisz)
127 127
128static int src_set_ca(struct src *src, unsigned int ca) 128static int src_set_ca(struct src *src, unsigned int ca)
129{ 129{
130 struct hw *hw = NULL; 130 struct hw *hw;
131 131
132 hw = (struct hw *)src->rsc.hw; 132 hw = src->rsc.hw;
133 hw->src_set_ca(src->rsc.ctrl_blk, ca); 133 hw->src_set_ca(src->rsc.ctrl_blk, ca);
134 134
135 return 0; 135 return 0;
@@ -137,9 +137,9 @@ static int src_set_ca(struct src *src, unsigned int ca)
137 137
138static int src_set_sa(struct src *src, unsigned int sa) 138static int src_set_sa(struct src *src, unsigned int sa)
139{ 139{
140 struct hw *hw = NULL; 140 struct hw *hw;
141 141
142 hw = (struct hw *)src->rsc.hw; 142 hw = src->rsc.hw;
143 hw->src_set_sa(src->rsc.ctrl_blk, sa); 143 hw->src_set_sa(src->rsc.ctrl_blk, sa);
144 144
145 return 0; 145 return 0;
@@ -147,9 +147,9 @@ static int src_set_sa(struct src *src, unsigned int sa)
147 147
148static int src_set_la(struct src *src, unsigned int la) 148static int src_set_la(struct src *src, unsigned int la)
149{ 149{
150 struct hw *hw = NULL; 150 struct hw *hw;
151 151
152 hw = (struct hw *)src->rsc.hw; 152 hw = src->rsc.hw;
153 hw->src_set_la(src->rsc.ctrl_blk, la); 153 hw->src_set_la(src->rsc.ctrl_blk, la);
154 154
155 return 0; 155 return 0;
@@ -157,9 +157,9 @@ static int src_set_la(struct src *src, unsigned int la)
157 157
158static int src_set_pitch(struct src *src, unsigned int pitch) 158static int src_set_pitch(struct src *src, unsigned int pitch)
159{ 159{
160 struct hw *hw = NULL; 160 struct hw *hw;
161 161
162 hw = (struct hw *)src->rsc.hw; 162 hw = src->rsc.hw;
163 hw->src_set_pitch(src->rsc.ctrl_blk, pitch); 163 hw->src_set_pitch(src->rsc.ctrl_blk, pitch);
164 164
165 return 0; 165 return 0;
@@ -167,9 +167,9 @@ static int src_set_pitch(struct src *src, unsigned int pitch)
167 167
168static int src_set_clear_zbufs(struct src *src) 168static int src_set_clear_zbufs(struct src *src)
169{ 169{
170 struct hw *hw = NULL; 170 struct hw *hw;
171 171
172 hw = (struct hw *)src->rsc.hw; 172 hw = src->rsc.hw;
173 hw->src_set_clear_zbufs(src->rsc.ctrl_blk, 1); 173 hw->src_set_clear_zbufs(src->rsc.ctrl_blk, 1);
174 174
175 return 0; 175 return 0;
@@ -177,11 +177,11 @@ static int src_set_clear_zbufs(struct src *src)
177 177
178static int src_commit_write(struct src *src) 178static int src_commit_write(struct src *src)
179{ 179{
180 struct hw *hw = NULL; 180 struct hw *hw;
181 int i = 0; 181 int i;
182 unsigned int dirty = 0; 182 unsigned int dirty = 0;
183 183
184 hw = (struct hw *)src->rsc.hw; 184 hw = src->rsc.hw;
185 src->rsc.ops->master(&src->rsc); 185 src->rsc.ops->master(&src->rsc);
186 if (src->rsc.msr > 1) { 186 if (src->rsc.msr > 1) {
187 /* Save dirty flags for conjugate resource programming */ 187 /* Save dirty flags for conjugate resource programming */
@@ -207,9 +207,9 @@ static int src_commit_write(struct src *src)
207 207
208static int src_get_ca(struct src *src) 208static int src_get_ca(struct src *src)
209{ 209{
210 struct hw *hw = NULL; 210 struct hw *hw;
211 211
212 hw = (struct hw *)src->rsc.hw; 212 hw = src->rsc.hw;
213 return hw->src_get_ca(hw, src->rsc.ops->index(&src->rsc), 213 return hw->src_get_ca(hw, src->rsc.ops->index(&src->rsc),
214 src->rsc.ctrl_blk); 214 src->rsc.ctrl_blk);
215} 215}
@@ -229,7 +229,7 @@ static struct src *src_next_interleave(struct src *src)
229static int src_default_config_memrd(struct src *src) 229static int src_default_config_memrd(struct src *src)
230{ 230{
231 struct hw *hw = src->rsc.hw; 231 struct hw *hw = src->rsc.hw;
232 unsigned int rsr = 0, msr = 0; 232 unsigned int rsr, msr;
233 233
234 hw->src_set_state(src->rsc.ctrl_blk, SRC_STATE_OFF); 234 hw->src_set_state(src->rsc.ctrl_blk, SRC_STATE_OFF);
235 hw->src_set_bm(src->rsc.ctrl_blk, 1); 235 hw->src_set_bm(src->rsc.ctrl_blk, 1);
@@ -297,7 +297,7 @@ static int src_default_config_memwr(struct src *src)
297static int src_default_config_arcrw(struct src *src) 297static int src_default_config_arcrw(struct src *src)
298{ 298{
299 struct hw *hw = src->rsc.hw; 299 struct hw *hw = src->rsc.hw;
300 unsigned int rsr = 0, msr = 0; 300 unsigned int rsr, msr;
301 unsigned int dirty; 301 unsigned int dirty;
302 302
303 hw->src_set_state(src->rsc.ctrl_blk, SRC_STATE_OFF); 303 hw->src_set_state(src->rsc.ctrl_blk, SRC_STATE_OFF);
@@ -360,8 +360,8 @@ static int
360src_rsc_init(struct src *src, u32 idx, 360src_rsc_init(struct src *src, u32 idx,
361 const struct src_desc *desc, struct src_mgr *mgr) 361 const struct src_desc *desc, struct src_mgr *mgr)
362{ 362{
363 int err = 0; 363 int err;
364 int i = 0, n = 0; 364 int i, n;
365 struct src *p; 365 struct src *p;
366 366
367 n = (MEMRD == desc->mode) ? desc->multi : 1; 367 n = (MEMRD == desc->mode) ? desc->multi : 1;
@@ -395,7 +395,7 @@ error1:
395 395
396static int src_rsc_uninit(struct src *src, struct src_mgr *mgr) 396static int src_rsc_uninit(struct src *src, struct src_mgr *mgr)
397{ 397{
398 int i = 0, n = 0; 398 int i, n;
399 struct src *p; 399 struct src *p;
400 400
401 n = (MEMRD == src->mode) ? src->multi : 1; 401 n = (MEMRD == src->mode) ? src->multi : 1;
@@ -416,8 +416,8 @@ static int
416get_src_rsc(struct src_mgr *mgr, const struct src_desc *desc, struct src **rsrc) 416get_src_rsc(struct src_mgr *mgr, const struct src_desc *desc, struct src **rsrc)
417{ 417{
418 unsigned int idx = SRC_RESOURCE_NUM; 418 unsigned int idx = SRC_RESOURCE_NUM;
419 int err = 0; 419 int err;
420 struct src *src = NULL; 420 struct src *src;
421 unsigned long flags; 421 unsigned long flags;
422 422
423 *rsrc = NULL; 423 *rsrc = NULL;
@@ -489,7 +489,7 @@ static int put_src_rsc(struct src_mgr *mgr, struct src *src)
489static int src_enable_s(struct src_mgr *mgr, struct src *src) 489static int src_enable_s(struct src_mgr *mgr, struct src *src)
490{ 490{
491 struct hw *hw = mgr->mgr.hw; 491 struct hw *hw = mgr->mgr.hw;
492 int i = 0; 492 int i;
493 493
494 src->rsc.ops->master(&src->rsc); 494 src->rsc.ops->master(&src->rsc);
495 for (i = 0; i < src->rsc.msr; i++) { 495 for (i = 0; i < src->rsc.msr; i++) {
@@ -505,7 +505,7 @@ static int src_enable_s(struct src_mgr *mgr, struct src *src)
505static int src_enable(struct src_mgr *mgr, struct src *src) 505static int src_enable(struct src_mgr *mgr, struct src *src)
506{ 506{
507 struct hw *hw = mgr->mgr.hw; 507 struct hw *hw = mgr->mgr.hw;
508 int i = 0; 508 int i;
509 509
510 src->rsc.ops->master(&src->rsc); 510 src->rsc.ops->master(&src->rsc);
511 for (i = 0; i < src->rsc.msr; i++) { 511 for (i = 0; i < src->rsc.msr; i++) {
@@ -521,7 +521,7 @@ static int src_enable(struct src_mgr *mgr, struct src *src)
521static int src_disable(struct src_mgr *mgr, struct src *src) 521static int src_disable(struct src_mgr *mgr, struct src *src)
522{ 522{
523 struct hw *hw = mgr->mgr.hw; 523 struct hw *hw = mgr->mgr.hw;
524 int i = 0; 524 int i;
525 525
526 src->rsc.ops->master(&src->rsc); 526 src->rsc.ops->master(&src->rsc);
527 for (i = 0; i < src->rsc.msr; i++) { 527 for (i = 0; i < src->rsc.msr; i++) {
@@ -545,7 +545,7 @@ static int src_mgr_commit_write(struct src_mgr *mgr)
545 545
546int src_mgr_create(void *hw, struct src_mgr **rsrc_mgr) 546int src_mgr_create(void *hw, struct src_mgr **rsrc_mgr)
547{ 547{
548 int err = 0, i = 0; 548 int err, i;
549 struct src_mgr *src_mgr; 549 struct src_mgr *src_mgr;
550 550
551 *rsrc_mgr = NULL; 551 *rsrc_mgr = NULL;
@@ -618,8 +618,8 @@ static struct rsc_ops srcimp_basic_rsc_ops = {
618 618
619static int srcimp_map(struct srcimp *srcimp, struct src *src, struct rsc *input) 619static int srcimp_map(struct srcimp *srcimp, struct src *src, struct rsc *input)
620{ 620{
621 struct imapper *entry = NULL; 621 struct imapper *entry;
622 int i = 0; 622 int i;
623 623
624 srcimp->rsc.ops->master(&srcimp->rsc); 624 srcimp->rsc.ops->master(&srcimp->rsc);
625 src->rsc.ops->master(&src->rsc); 625 src->rsc.ops->master(&src->rsc);
@@ -646,7 +646,7 @@ static int srcimp_map(struct srcimp *srcimp, struct src *src, struct rsc *input)
646 646
647static int srcimp_unmap(struct srcimp *srcimp) 647static int srcimp_unmap(struct srcimp *srcimp)
648{ 648{
649 int i = 0; 649 int i;
650 650
651 /* Program master and conjugate resources */ 651 /* Program master and conjugate resources */
652 for (i = 0; i < srcimp->rsc.msr; i++) { 652 for (i = 0; i < srcimp->rsc.msr; i++) {
@@ -669,7 +669,7 @@ static int srcimp_rsc_init(struct srcimp *srcimp,
669 const struct srcimp_desc *desc, 669 const struct srcimp_desc *desc,
670 struct srcimp_mgr *mgr) 670 struct srcimp_mgr *mgr)
671{ 671{
672 int err = 0; 672 int err;
673 673
674 err = rsc_init(&srcimp->rsc, srcimp->idx[0], 674 err = rsc_init(&srcimp->rsc, srcimp->idx[0],
675 SRCIMP, desc->msr, mgr->mgr.hw); 675 SRCIMP, desc->msr, mgr->mgr.hw);
@@ -715,9 +715,9 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr,
715 const struct srcimp_desc *desc, 715 const struct srcimp_desc *desc,
716 struct srcimp **rsrcimp) 716 struct srcimp **rsrcimp)
717{ 717{
718 int err = 0, i = 0; 718 int err, i;
719 unsigned int idx = 0; 719 unsigned int idx;
720 struct srcimp *srcimp = NULL; 720 struct srcimp *srcimp;
721 unsigned long flags; 721 unsigned long flags;
722 722
723 *rsrcimp = NULL; 723 *rsrcimp = NULL;
@@ -765,7 +765,7 @@ error1:
765static int put_srcimp_rsc(struct srcimp_mgr *mgr, struct srcimp *srcimp) 765static int put_srcimp_rsc(struct srcimp_mgr *mgr, struct srcimp *srcimp)
766{ 766{
767 unsigned long flags; 767 unsigned long flags;
768 int i = 0; 768 int i;
769 769
770 spin_lock_irqsave(&mgr->mgr_lock, flags); 770 spin_lock_irqsave(&mgr->mgr_lock, flags);
771 for (i = 0; i < srcimp->rsc.msr; i++) 771 for (i = 0; i < srcimp->rsc.msr; i++)
@@ -795,7 +795,7 @@ static int srcimp_map_op(void *data, struct imapper *entry)
795static int srcimp_imap_add(struct srcimp_mgr *mgr, struct imapper *entry) 795static int srcimp_imap_add(struct srcimp_mgr *mgr, struct imapper *entry)
796{ 796{
797 unsigned long flags; 797 unsigned long flags;
798 int err = 0; 798 int err;
799 799
800 spin_lock_irqsave(&mgr->imap_lock, flags); 800 spin_lock_irqsave(&mgr->imap_lock, flags);
801 if ((0 == entry->addr) && (mgr->init_imap_added)) { 801 if ((0 == entry->addr) && (mgr->init_imap_added)) {
@@ -812,7 +812,7 @@ static int srcimp_imap_add(struct srcimp_mgr *mgr, struct imapper *entry)
812static int srcimp_imap_delete(struct srcimp_mgr *mgr, struct imapper *entry) 812static int srcimp_imap_delete(struct srcimp_mgr *mgr, struct imapper *entry)
813{ 813{
814 unsigned long flags; 814 unsigned long flags;
815 int err = 0; 815 int err;
816 816
817 spin_lock_irqsave(&mgr->imap_lock, flags); 817 spin_lock_irqsave(&mgr->imap_lock, flags);
818 err = input_mapper_delete(&mgr->imappers, entry, srcimp_map_op, mgr); 818 err = input_mapper_delete(&mgr->imappers, entry, srcimp_map_op, mgr);
@@ -828,7 +828,7 @@ static int srcimp_imap_delete(struct srcimp_mgr *mgr, struct imapper *entry)
828 828
829int srcimp_mgr_create(void *hw, struct srcimp_mgr **rsrcimp_mgr) 829int srcimp_mgr_create(void *hw, struct srcimp_mgr **rsrcimp_mgr)
830{ 830{
831 int err = 0; 831 int err;
832 struct srcimp_mgr *srcimp_mgr; 832 struct srcimp_mgr *srcimp_mgr;
833 struct imapper *entry; 833 struct imapper *entry;
834 834