aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_compat.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/pcmcia_compat.c')
-rw-r--r--drivers/pcmcia/pcmcia_compat.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/pcmcia/pcmcia_compat.c b/drivers/pcmcia/pcmcia_compat.c
index 1cc83317e7e3..916de6f85a2f 100644
--- a/drivers/pcmcia/pcmcia_compat.c
+++ b/drivers/pcmcia/pcmcia_compat.c
@@ -31,28 +31,22 @@
31int pcmcia_get_first_tuple(client_handle_t handle, tuple_t *tuple) 31int pcmcia_get_first_tuple(client_handle_t handle, tuple_t *tuple)
32{ 32{
33 struct pcmcia_socket *s; 33 struct pcmcia_socket *s;
34 if (CHECK_HANDLE(handle))
35 return CS_BAD_HANDLE;
36 s = SOCKET(handle); 34 s = SOCKET(handle);
37 return pccard_get_first_tuple(s, handle->Function, tuple); 35 return pccard_get_first_tuple(s, handle->func, tuple);
38} 36}
39EXPORT_SYMBOL(pcmcia_get_first_tuple); 37EXPORT_SYMBOL(pcmcia_get_first_tuple);
40 38
41int pcmcia_get_next_tuple(client_handle_t handle, tuple_t *tuple) 39int pcmcia_get_next_tuple(client_handle_t handle, tuple_t *tuple)
42{ 40{
43 struct pcmcia_socket *s; 41 struct pcmcia_socket *s;
44 if (CHECK_HANDLE(handle))
45 return CS_BAD_HANDLE;
46 s = SOCKET(handle); 42 s = SOCKET(handle);
47 return pccard_get_next_tuple(s, handle->Function, tuple); 43 return pccard_get_next_tuple(s, handle->func, tuple);
48} 44}
49EXPORT_SYMBOL(pcmcia_get_next_tuple); 45EXPORT_SYMBOL(pcmcia_get_next_tuple);
50 46
51int pcmcia_get_tuple_data(client_handle_t handle, tuple_t *tuple) 47int pcmcia_get_tuple_data(client_handle_t handle, tuple_t *tuple)
52{ 48{
53 struct pcmcia_socket *s; 49 struct pcmcia_socket *s;
54 if (CHECK_HANDLE(handle))
55 return CS_BAD_HANDLE;
56 s = SOCKET(handle); 50 s = SOCKET(handle);
57 return pccard_get_tuple_data(s, tuple); 51 return pccard_get_tuple_data(s, tuple);
58} 52}
@@ -67,10 +61,8 @@ EXPORT_SYMBOL(pcmcia_parse_tuple);
67int pcmcia_validate_cis(client_handle_t handle, cisinfo_t *info) 61int pcmcia_validate_cis(client_handle_t handle, cisinfo_t *info)
68{ 62{
69 struct pcmcia_socket *s; 63 struct pcmcia_socket *s;
70 if (CHECK_HANDLE(handle))
71 return CS_BAD_HANDLE;
72 s = SOCKET(handle); 64 s = SOCKET(handle);
73 return pccard_validate_cis(s, handle->Function, info); 65 return pccard_validate_cis(s, handle->func, info);
74} 66}
75EXPORT_SYMBOL(pcmcia_validate_cis); 67EXPORT_SYMBOL(pcmcia_validate_cis);
76 68
@@ -78,9 +70,7 @@ EXPORT_SYMBOL(pcmcia_validate_cis);
78int pcmcia_reset_card(client_handle_t handle, client_req_t *req) 70int pcmcia_reset_card(client_handle_t handle, client_req_t *req)
79{ 71{
80 struct pcmcia_socket *skt; 72 struct pcmcia_socket *skt;
81 73
82 if (CHECK_HANDLE(handle))
83 return CS_BAD_HANDLE;
84 skt = SOCKET(handle); 74 skt = SOCKET(handle);
85 if (!skt) 75 if (!skt)
86 return CS_BAD_HANDLE; 76 return CS_BAD_HANDLE;
@@ -88,4 +78,3 @@ int pcmcia_reset_card(client_handle_t handle, client_req_t *req)
88 return pccard_reset_card(skt); 78 return pccard_reset_card(skt);
89} 79}
90EXPORT_SYMBOL(pcmcia_reset_card); 80EXPORT_SYMBOL(pcmcia_reset_card);
91