diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-29 16:19:39 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 17:20:22 +0200 |
| commit | fc301101034c06bf56a7f71bf682c48909e401a4 (patch) | |
| tree | f1faa456d436515d73679bb12587967efba05e7c /include | |
| parent | 1a4a046030ade0f57b8f3b476d61c7c35d894b66 (diff) | |
| download | linux-3.10-fc301101034c06bf56a7f71bf682c48909e401a4.tar.gz linux-3.10-fc301101034c06bf56a7f71bf682c48909e401a4.tar.bz2 linux-3.10-fc301101034c06bf56a7f71bf682c48909e401a4.zip | |
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 'include')
| -rw-r--r-- | include/pcmcia/cs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index e656abee174..29d693f72ba 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h @@ -24,7 +24,6 @@ typedef struct config_req_t { u_int Attributes; u_int IntType; u_int ConfigBase; - u_char Status, ExtStatus; u_char ConfigIndex; u_int Present; } config_req_t; @@ -34,6 +33,7 @@ typedef struct config_req_t { #define CONF_ENABLE_DMA 0x02 #define CONF_ENABLE_SPKR 0x04 #define CONF_ENABLE_PULSE_IRQ 0x08 +#define CONF_ENABLE_ESR 0x10 #define CONF_VALID_CLIENT 0x100 /* IntType field */ |