diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-24 06:23:21 -0400 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-08-03 03:02:35 -0400 |
| commit | 1d5cc192d431bce2ebe9fde64054ce903200e179 (patch) | |
| tree | cdcdfb77712349bf46f0876d420e2be81f901d74 /include/pcmcia | |
| parent | ac8b422838046ffc26be4874a3cbae0d313f4209 (diff) | |
pcmcia: use pcmica_{read,write}_config_byte
Use pcmcia_read_config_byte and pcmcia_write_config_byte instead
of pcmcia_access_configuration_register.
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-serial@vger.kernel.org
CC: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
| -rw-r--r-- | include/pcmcia/cs.h | 12 | ||||
| -rw-r--r-- | include/pcmcia/ds.h | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index c78d9b11208..64e853d58c3 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h | |||
| @@ -19,18 +19,6 @@ | |||
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #endif | 20 | #endif |
| 21 | 21 | ||
| 22 | /* For AccessConfigurationRegister */ | ||
| 23 | typedef struct conf_reg_t { | ||
| 24 | u_char Function; | ||
| 25 | u_int Action; | ||
| 26 | off_t Offset; | ||
| 27 | u_int Value; | ||
| 28 | } conf_reg_t; | ||
| 29 | |||
| 30 | /* Actions */ | ||
| 31 | #define CS_READ 1 | ||
| 32 | #define CS_WRITE 2 | ||
| 33 | |||
| 34 | /* for AdjustResourceInfo */ | 22 | /* for AdjustResourceInfo */ |
| 35 | /* Action field */ | 23 | /* Action field */ |
| 36 | #define REMOVE_MANAGED_RESOURCE 1 | 24 | #define REMOVE_MANAGED_RESOURCE 1 |
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index e614aa0ca2a..d494ce417b4 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
| @@ -174,8 +174,8 @@ struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *p_dev); | |||
| 174 | int pcmcia_reset_card(struct pcmcia_socket *skt); | 174 | int pcmcia_reset_card(struct pcmcia_socket *skt); |
| 175 | 175 | ||
| 176 | /* CIS config */ | 176 | /* CIS config */ |
| 177 | int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, | 177 | int pcmcia_read_config_byte(struct pcmcia_device *p_dev, off_t where, u8 *val); |
| 178 | conf_reg_t *reg); | 178 | int pcmcia_write_config_byte(struct pcmcia_device *p_dev, off_t where, u8 val); |
| 179 | 179 | ||
| 180 | /* device configuration */ | 180 | /* device configuration */ |
| 181 | int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); | 181 | int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); |
