diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-29 10:19:39 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 11:20:22 -0400 |
commit | fc301101034c06bf56a7f71bf682c48909e401a4 (patch) | |
tree | f1faa456d436515d73679bb12587967efba05e7c /drivers/net/pcmcia/axnet_cs.c | |
parent | 1a4a046030ade0f57b8f3b476d61c7c35d894b66 (diff) |
pcmcia: simplify Status, ExtStatus register access
The Status (CISREG_CCSR) and ExtStatus (CISREG_ESR) registers were
only accessed to enable audio output for some drivers and IRQ for
serial_cs.c. The former also required setting config_req_t.Attributes
to CONF_ENABLE_SPKR; the latter can be simplified to setting this
field to CONF_ENABLE_ESR.
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-serial@vger.kernel.org
CC: linux-scsi@vger.kernel.org
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/pcmcia/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 5f05ffb240cc..8734ed8f174d 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -334,10 +334,8 @@ static int axnet_config(struct pcmcia_device *link) | |||
334 | if (!link->irq) | 334 | if (!link->irq) |
335 | goto failed; | 335 | goto failed; |
336 | 336 | ||
337 | if (resource_size(link->resource[1]) == 8) { | 337 | if (resource_size(link->resource[1]) == 8) |
338 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 338 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
339 | link->conf.Status = CCSR_AUDIO_ENA; | ||
340 | } | ||
341 | 339 | ||
342 | ret = pcmcia_request_configuration(link, &link->conf); | 340 | ret = pcmcia_request_configuration(link, &link->conf); |
343 | if (ret) | 341 | if (ret) |