diff options
author | 2005-07-08 08:52:42 -0700 | |
---|---|---|
committer | 2005-07-08 08:52:42 -0700 | |
commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /drivers/pcmcia/cs_internal.h | |
parent | [PATCH] Documentation (diff) | |
parent | [PATCH] Add MAINTAINERS entry for audit subsystem (diff) | |
download | linux-dev-88c3cdfdde3cf87e1831265ea4246430bef34fc9.tar.xz linux-dev-88c3cdfdde3cf87e1831265ea4246430bef34fc9.zip |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
-rw-r--r-- | drivers/pcmcia/cs_internal.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 0b4c18edfa49..6bbfbd0e02a5 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h @@ -99,23 +99,11 @@ static inline void cs_socket_put(struct pcmcia_socket *skt) } } -#define CHECK_HANDLE(h) \ - (((h) == NULL) || ((h)->client_magic != CLIENT_MAGIC)) - #define CHECK_SOCKET(s) \ (((s) >= sockets) || (socket_table[s]->ops == NULL)) -#define SOCKET(h) (h->Socket) -#define CONFIG(h) (&SOCKET(h)->config[(h)->Function]) - -#define CHECK_REGION(r) \ - (((r) == NULL) || ((r)->region_magic != REGION_MAGIC)) - -#define CHECK_ERASEQ(q) \ - (((q) == NULL) || ((q)->eraseq_magic != ERASEQ_MAGIC)) - -#define EVENT(h, e, p) \ - ((h)->event_handler((e), (p), &(h)->event_callback_args)) +#define SOCKET(h) (h->socket) +#define CONFIG(h) (&SOCKET(h)->config[(h)->func]) /* In cardbus.c */ int cb_alloc(struct pcmcia_socket *s); |