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 /include/pcmcia | |
| 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 'include/pcmcia')
| -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 e656abee1741..29d693f72ba9 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h | |||
| @@ -24,7 +24,6 @@ typedef struct config_req_t { | |||
| 24 | u_int Attributes; | 24 | u_int Attributes; |
| 25 | u_int IntType; | 25 | u_int IntType; |
| 26 | u_int ConfigBase; | 26 | u_int ConfigBase; |
| 27 | u_char Status, ExtStatus; | ||
| 28 | u_char ConfigIndex; | 27 | u_char ConfigIndex; |
| 29 | u_int Present; | 28 | u_int Present; |
| 30 | } config_req_t; | 29 | } config_req_t; |
| @@ -34,6 +33,7 @@ typedef struct config_req_t { | |||
| 34 | #define CONF_ENABLE_DMA 0x02 | 33 | #define CONF_ENABLE_DMA 0x02 |
| 35 | #define CONF_ENABLE_SPKR 0x04 | 34 | #define CONF_ENABLE_SPKR 0x04 |
| 36 | #define CONF_ENABLE_PULSE_IRQ 0x08 | 35 | #define CONF_ENABLE_PULSE_IRQ 0x08 |
| 36 | #define CONF_ENABLE_ESR 0x10 | ||
| 37 | #define CONF_VALID_CLIENT 0x100 | 37 | #define CONF_VALID_CLIENT 0x100 |
| 38 | 38 | ||
| 39 | /* IntType field */ | 39 | /* IntType field */ |
