[PCMCIA] socket user operations should take pcmcia_socket

Patch from Dominik Brodowski, updated by Russell King.

The pcmcia_{suspend,resume,eject,insert}_card calls are only issued
by the userspace cardctl tool via ds.c. There's no need to verify the
caller (ds) has a valid "handle", as long as it knows the proper
struct pcmcia_socket.

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index ec9c5ae990161c9a350ea294a70f6c0750856969..fed090991090874d5f610d24a750fc598780f468 100644 (file)
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -1958,14 +1958,10 @@ int pcmcia_reset_card(client_handle_t handle, client_req_t *req)
     
 ======================================================================*/
 
-int pcmcia_suspend_card(client_handle_t handle, client_req_t *req)
+int pcmcia_suspend_card(struct pcmcia_socket *skt)
 {
-       struct pcmcia_socket *skt;
        int ret;
     
-       if (CHECK_HANDLE(handle))
-               return CS_BAD_HANDLE;
-       skt = SOCKET(handle);
        cs_dbg(skt, 1, "suspending socket\n");
 
        down(&skt->skt_sem);
@@ -1985,14 +1981,10 @@ int pcmcia_suspend_card(client_handle_t handle, client_req_t *req)
        return ret;
 } /* suspend_card */
 
-int pcmcia_resume_card(client_handle_t handle, client_req_t *req)
+int pcmcia_resume_card(struct pcmcia_socket *skt)
 {
-       struct pcmcia_socket *skt;
        int ret;
     
-       if (CHECK_HANDLE(handle))
-               return CS_BAD_HANDLE;
-       skt = SOCKET(handle);
        cs_dbg(skt, 1, "waking up socket\n");
 
        down(&skt->skt_sem);
@@ -2018,14 +2010,10 @@ int pcmcia_resume_card(client_handle_t handle, client_req_t *req)
     
 ======================================================================*/
 
-int pcmcia_eject_card(client_handle_t handle, client_req_t *req)
+int pcmcia_eject_card(struct pcmcia_socket *skt)
 {
-       struct pcmcia_socket *skt;
        int ret;
     
-       if (CHECK_HANDLE(handle))
-               return CS_BAD_HANDLE;
-       skt = SOCKET(handle);
        cs_dbg(skt, 1, "user eject request\n");
 
        down(&skt->skt_sem);
@@ -2047,14 +2035,10 @@ int pcmcia_eject_card(client_handle_t handle, client_req_t *req)
        return ret;
 } /* eject_card */
 
-int pcmcia_insert_card(client_handle_t handle, client_req_t *req)
+int pcmcia_insert_card(struct pcmcia_socket *skt)
 {
-       struct pcmcia_socket *skt;
        int ret;
 
-       if (CHECK_HANDLE(handle))
-               return CS_BAD_HANDLE;
-       skt = SOCKET(handle);
        cs_dbg(skt, 1, "user insert request\n");
 
        down(&skt->skt_sem);

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index aad185532d90467010ebb9672a4c0ddc6248c7c6..7e93bfccbbc4f2285a164cdfdd46e3b840eb076c 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -964,16 +964,16 @@ static int ds_ioctl(struct inode * inode, struct file * file,
        ret = pcmcia_validate_cis(s->handle, &buf.cisinfo);
        break;
     case DS_SUSPEND_CARD:
-       ret = pcmcia_suspend_card(s->handle, NULL);
+       ret = pcmcia_suspend_card(s->parent);
        break;
     case DS_RESUME_CARD:
-       ret = pcmcia_resume_card(s->handle, NULL);
+       ret = pcmcia_resume_card(s->parent);
        break;
     case DS_EJECT_CARD:
-       ret = pcmcia_eject_card(s->handle, NULL);
+       ret = pcmcia_eject_card(s->parent);
        break;
     case DS_INSERT_CARD:
-       ret = pcmcia_insert_card(s->handle, NULL);
+       ret = pcmcia_insert_card(s->parent);
        break;
     case DS_ACCESS_CONFIGURATION_REGISTER:
        if ((buf.conf_reg.Action == CS_WRITE) && !capable(CAP_SYS_ADMIN))

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index d6b5fba20a1c3e7f53a2073d9cbddc52c3329fa2..871d8f1d9ac80731c1f3947f570bef1b286df7d5 100644 (file)
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -445,10 +445,10 @@ int pcmcia_request_io(client_handle_t handle, io_req_t *req);
 int pcmcia_request_irq(client_handle_t handle, irq_req_t *req);
 int pcmcia_request_window(client_handle_t *handle, win_req_t *req, window_handle_t *wh);
 int pcmcia_reset_card(client_handle_t handle, client_req_t *req);
-int pcmcia_suspend_card(client_handle_t handle, client_req_t *req);
-int pcmcia_resume_card(client_handle_t handle, client_req_t *req);
-int pcmcia_eject_card(client_handle_t handle, client_req_t *req);
-int pcmcia_insert_card(client_handle_t handle, client_req_t *req);
+int pcmcia_suspend_card(struct pcmcia_socket *skt);
+int pcmcia_resume_card(struct pcmcia_socket *skt);
+int pcmcia_eject_card(struct pcmcia_socket *skt);
+int pcmcia_insert_card(struct pcmcia_socket *skt);
 int pcmcia_set_event_mask(client_handle_t handle, eventmask_t *mask);
 int pcmcia_report_error(client_handle_t handle, error_info_t *err);
 struct pci_bus *pcmcia_lookup_bus(client_handle_t handle);