diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-24 12:23:21 +0200 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-08-03 09:02:35 +0200 |
commit | 1d5cc192d431bce2ebe9fde64054ce903200e179 (patch) | |
tree | cdcdfb77712349bf46f0876d420e2be81f901d74 /include/pcmcia | |
parent | pcmcia: remove cs_types.h (diff) | |
download | linux-1d5cc192d431bce2ebe9fde64054ce903200e179.tar.xz linux-1d5cc192d431bce2ebe9fde64054ce903200e179.zip |
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 c78d9b112080..64e853d58c35 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h @@ -19,18 +19,6 @@ #include <linux/interrupt.h> #endif -/* For AccessConfigurationRegister */ -typedef struct conf_reg_t { - u_char Function; - u_int Action; - off_t Offset; - u_int Value; -} conf_reg_t; - -/* Actions */ -#define CS_READ 1 -#define CS_WRITE 2 - /* for AdjustResourceInfo */ /* Action field */ #define REMOVE_MANAGED_RESOURCE 1 diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index e614aa0ca2a2..d494ce417b4f 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); int pcmcia_reset_card(struct pcmcia_socket *skt); /* CIS config */ -int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, - conf_reg_t *reg); +int pcmcia_read_config_byte(struct pcmcia_device *p_dev, off_t where, u8 *val); +int pcmcia_write_config_byte(struct pcmcia_device *p_dev, off_t where, u8 val); /* device configuration */ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); |