summaryrefslogtreecommitdiffstats
path: root/include/pcmcia/ds.h
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-07-08 02:59:01 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 03:24:06 +0200
commite12a9a93a8417c4f2aa46ce8346c2d27e656b9a2 (patch)
treeca4295237f29c54901c199b322e504f89a45c902 /include/pcmcia/ds.h
parent[PATCH] pcmcia: move event handler (diff)
downloadlinux-e12a9a93a8417c4f2aa46ce8346c2d27e656b9a2.tar.xz
linux-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 '')
-rw-r--r--include/pcmcia/ds.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index c574ff108148..e0a5acb7fcb7 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);