diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-28 12:12:06 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-12-07 16:23:24 -0500 |
commit | e15c1c1f3f903f679c9782b540f9d52c80c99610 (patch) | |
tree | dc7c18f9f783b0f1c689e5ddd3ae7873421912eb /drivers/isdn | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) |
pcmcia: remove unused IRQ_FIRST_SHARED
Komuro pointed out that IRQ_FIRST_SHARED is not used at all in the
PCMCIA subsystem, so remove it. Also, remove two bogus assignments.
CC: Karsten Keil <keil@b1-systems.de>
CC: netdev@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/hardware/avm/avm_cs.c | 3 | ||||
-rw-r--r-- | drivers/isdn/hisax/avma1_cs.c | 3 | ||||
-rw-r--r-- | drivers/isdn/hisax/elsa_cs.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/sedlbauer_cs.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/teles_cs.c | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c index 5a6ae646a636..94b796d84053 100644 --- a/drivers/isdn/hardware/avm/avm_cs.c +++ b/drivers/isdn/hardware/avm/avm_cs.c | |||
@@ -108,8 +108,7 @@ static int avmcs_probe(struct pcmcia_device *p_dev) | |||
108 | p_dev->io.NumPorts2 = 0; | 108 | p_dev->io.NumPorts2 = 0; |
109 | 109 | ||
110 | /* Interrupt setup */ | 110 | /* Interrupt setup */ |
111 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 111 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
112 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | ||
113 | 112 | ||
114 | /* General socket configuration */ | 113 | /* General socket configuration */ |
115 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 114 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c index f9bdff39cf4a..e5deb15cf40c 100644 --- a/drivers/isdn/hisax/avma1_cs.c +++ b/drivers/isdn/hisax/avma1_cs.c | |||
@@ -120,8 +120,7 @@ static int avma1cs_probe(struct pcmcia_device *p_dev) | |||
120 | p_dev->io.IOAddrLines = 5; | 120 | p_dev->io.IOAddrLines = 5; |
121 | 121 | ||
122 | /* Interrupt setup */ | 122 | /* Interrupt setup */ |
123 | p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 123 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
124 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | ||
125 | 124 | ||
126 | /* General socket configuration */ | 125 | /* General socket configuration */ |
127 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 126 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c index a2f709f53974..c9a30b1c9237 100644 --- a/drivers/isdn/hisax/elsa_cs.c +++ b/drivers/isdn/hisax/elsa_cs.c | |||
@@ -137,7 +137,7 @@ static int elsa_cs_probe(struct pcmcia_device *link) | |||
137 | local->cardnr = -1; | 137 | local->cardnr = -1; |
138 | 138 | ||
139 | /* Interrupt setup */ | 139 | /* Interrupt setup */ |
140 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 140 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
141 | link->irq.Handler = NULL; | 141 | link->irq.Handler = NULL; |
142 | 142 | ||
143 | /* | 143 | /* |
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c index af5d393cc2d0..7836ec3c7f86 100644 --- a/drivers/isdn/hisax/sedlbauer_cs.c +++ b/drivers/isdn/hisax/sedlbauer_cs.c | |||
@@ -144,7 +144,7 @@ static int sedlbauer_probe(struct pcmcia_device *link) | |||
144 | link->priv = local; | 144 | link->priv = local; |
145 | 145 | ||
146 | /* Interrupt setup */ | 146 | /* Interrupt setup */ |
147 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 147 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
148 | link->irq.Handler = NULL; | 148 | link->irq.Handler = NULL; |
149 | 149 | ||
150 | /* | 150 | /* |
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c index ea705394ce2b..b0c5976cbdb3 100644 --- a/drivers/isdn/hisax/teles_cs.c +++ b/drivers/isdn/hisax/teles_cs.c | |||
@@ -127,7 +127,7 @@ static int teles_probe(struct pcmcia_device *link) | |||
127 | link->priv = local; | 127 | link->priv = local; |
128 | 128 | ||
129 | /* Interrupt setup */ | 129 | /* Interrupt setup */ |
130 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 130 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
131 | link->irq.Handler = NULL; | 131 | link->irq.Handler = NULL; |
132 | 132 | ||
133 | /* | 133 | /* |