diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-06 14:42:35 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-05-10 04:23:10 -0400 |
commit | 0cb3c49cdd275aa9ef4b1afd090117b1b86a16d4 (patch) | |
tree | 50875569280b23aa9919afbe7c1c3772a48712b3 /drivers/pcmcia | |
parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) |
pcmcia: remove unused IRQ modification feature
The IRQ modification feature was unused, and I see no reason to keep it.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 7c3d03bb4f30..ba82cb3b1944 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
@@ -275,19 +275,9 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev, | |||
275 | goto unlock; | 275 | goto unlock; |
276 | } | 276 | } |
277 | 277 | ||
278 | if (mod->Attributes & CONF_IRQ_CHANGE_VALID) { | 278 | if (mod->Attributes & (CONF_IRQ_CHANGE_VALID | CONF_VCC_CHANGE_VALID)) { |
279 | if (mod->Attributes & CONF_ENABLE_IRQ) { | 279 | dev_dbg(&s->dev, |
280 | c->Attributes |= CONF_ENABLE_IRQ; | 280 | "changing Vcc or IRQ is not allowed at this time\n"); |
281 | s->socket.io_irq = s->irq.AssignedIRQ; | ||
282 | } else { | ||
283 | c->Attributes &= ~CONF_ENABLE_IRQ; | ||
284 | s->socket.io_irq = 0; | ||
285 | } | ||
286 | s->ops->set_socket(s, &s->socket); | ||
287 | } | ||
288 | |||
289 | if (mod->Attributes & CONF_VCC_CHANGE_VALID) { | ||
290 | dev_dbg(&s->dev, "changing Vcc is not allowed at this time\n"); | ||
291 | ret = -EINVAL; | 281 | ret = -EINVAL; |
292 | goto unlock; | 282 | goto unlock; |
293 | } | 283 | } |