diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-07-07 17:59:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 18:24:06 -0700 |
| commit | e12a9a93a8417c4f2aa46ce8346c2d27e656b9a2 (patch) | |
| tree | ca4295237f29c54901c199b322e504f89a45c902 /include/pcmcia | |
| parent | 1e212f3645a6b355de8c43a23376bc0e2ac49a63 (diff) | |
| download | linux-3.10-e12a9a93a8417c4f2aa46ce8346c2d27e656b9a2.tar.gz linux-3.10-e12a9a93a8417c4f2aa46ce8346c2d27e656b9a2.tar.bz2 linux-3.10-e12a9a93a8417c4f2aa46ce8346c2d27e656b9a2.zip | |
[PATCH] pcmcia: remove client_t usage
Reduce the occurences of "client_handle_t" which is nothing else than a
pointer to struct pcmcia_device by now.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/pcmcia')
| -rw-r--r-- | include/pcmcia/cs_types.h | 4 | ||||
| -rw-r--r-- | include/pcmcia/ds.h | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h index 7881d40aac8..c1d1629fcd2 100644 --- a/include/pcmcia/cs_types.h +++ b/include/pcmcia/cs_types.h @@ -34,8 +34,8 @@ typedef u_int event_t; typedef u_char cisdata_t; typedef u_short page_t; -struct client_t; -typedef struct client_t *client_handle_t; +struct pcmcia_device; +typedef struct pcmcia_device *client_handle_t; struct window_t; typedef struct window_t *window_handle_t; diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index c574ff10814..e0a5acb7fcb 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h @@ -162,13 +162,7 @@ struct pcmcia_device { struct soon */ dev_link_t *instance; event_callback_args_t event_callback_args; - - struct client_t { - u_short client_magic; - struct pcmcia_socket *Socket; - u_char Function; - u_int state; - } client; + u_int state; /* information about this device */ u8 has_manf_id:1; @@ -193,8 +187,8 @@ struct pcmcia_device { #define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev) #define to_pcmcia_drv(n) container_of(n, struct pcmcia_driver, drv) -#define handle_to_pdev(handle) container_of(handle, struct pcmcia_device, client); -#define handle_to_dev(handle) ((container_of(handle, struct pcmcia_device, client))->dev) +#define handle_to_pdev(handle) (handle) +#define handle_to_dev(handle) (handle->dev) /* error reporting */ void cs_error(client_handle_t handle, int func, int ret); |