git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
sound
/
oss
/
dmasound
/
dmasound_awacs.c
diff --git
a/sound/oss/dmasound/dmasound_awacs.c
b/sound/oss/dmasound/dmasound_awacs.c
index
c8e2103
..
4359903
100644
(file)
--- a/
sound/oss/dmasound/dmasound_awacs.c
+++ b/
sound/oss/dmasound/dmasound_awacs.c
@@
-67,7
+67,6
@@
#include <linux/types.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/delay.h>
@@
-375,10
+374,7
@@
setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int*
*gpio_pol = *pp;
else
*gpio_pol = 1;
*gpio_pol = *pp;
else
*gpio_pol = 1;
- if (np->n_intrs > 0)
- return np->intrs[0].line;
-
- return 0;
+ return irq_of_parse_and_map(np, 0);
}
static inline void
}
static inline void
@@
-2865,14
+2861,13
@@
printk("dmasound_pmac: couldn't find a Codec we can handle\n");
* other info if necessary (early AWACS we want to read chip ids)
*/
* other info if necessary (early AWACS we want to read chip ids)
*/
- if (of_get_address(io, 2, NULL, NULL) == NULL
|| io->n_intrs < 3
) {
+ if (of_get_address(io, 2, NULL, NULL) == NULL) {
/* OK - maybe we need to use the 'awacs' node (on earlier
* machines).
*/
if (awacs_node) {
io = awacs_node ;
/* OK - maybe we need to use the 'awacs' node (on earlier
* machines).
*/
if (awacs_node) {
io = awacs_node ;
- if (of_get_address(io, 2, NULL, NULL) == NULL ||
- io->n_intrs < 3) {
+ if (of_get_address(io, 2, NULL, NULL) == NULL) {
printk("dmasound_pmac: can't use %s\n",
io->full_name);
return -ENODEV;
printk("dmasound_pmac: can't use %s\n",
io->full_name);
return -ENODEV;
@@
-2941,9
+2936,9
@@
printk("dmasound_pmac: couldn't find a Codec we can handle\n");
if (awacs_revision == AWACS_SCREAMER && awacs)
awacs_recalibrate();
if (awacs_revision == AWACS_SCREAMER && awacs)
awacs_recalibrate();
- awacs_irq = i
o->intrs[0].line
;
- awacs_tx_irq = i
o->intrs[1].line
;
- awacs_rx_irq = i
o->intrs[2].line
;
+ awacs_irq = i
rq_of_parse_and_map(io, 0)
;
+ awacs_tx_irq = i
rq_of_parse_and_map(io, 1)
;
+ awacs_rx_irq = i
rq_of_parse_and_map(io, 2)
;
/* Hack for legacy crap that will be killed someday */
awacs_node = io;
/* Hack for legacy crap that will be killed someday */
awacs_node = io;