
From: Dominik Brodowski <linux@dominikbrodowski.de>

Unify bind_device and pcmcia_bind_device. Also, change bind_device so
that it conforms to CodingStyle.

Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/drivers/pcmcia/ds.c |  159 ++++++++++++++++++--------------------------
 25-akpm/include/pcmcia/cs.h |    9 --
 2 files changed, 68 insertions(+), 100 deletions(-)

diff -puN drivers/pcmcia/ds.c~pcmcia-unfiy-bind_device-and-pcmcia_bind_device drivers/pcmcia/ds.c
--- 25/drivers/pcmcia/ds.c~pcmcia-unfiy-bind_device-and-pcmcia_bind_device	2004-12-03 18:44:25.109965904 -0800
+++ 25-akpm/drivers/pcmcia/ds.c	2004-12-03 18:44:25.115964992 -0800
@@ -128,49 +128,12 @@ struct pcmcia_bus_socket {
 
 /*====================================================================*/
 
-/* Device driver ID passed to Card Services */
-static dev_info_t dev_info = "Driver Services";
-
 static int major_dev = -1;
 
 /*====================================================================*/
 
 /* code which was in cs.c before */
 
-/*======================================================================
-
-    Bind_device() associates a device driver with a particular socket.
-    It is normally called by Driver Services after it has identified
-    a newly inserted card.  An instance of that driver will then be
-    eligible to register as a client of this socket.
-    
-======================================================================*/
-
-static int pcmcia_bind_device(bind_req_t *req)
-{
-	client_t *client;
-	struct pcmcia_socket *s;
-
-	s = req->Socket;
-	if (!s)
-		return CS_BAD_SOCKET;
-
-	client = (client_t *) kmalloc(sizeof(client_t), GFP_KERNEL);
-	if (!client) 
-		return CS_OUT_OF_RESOURCE;
-	memset(client, '\0', sizeof(client_t));
-	client->client_magic = CLIENT_MAGIC;
-	strlcpy(client->dev_info, (char *)req->dev_info, DEV_NAME_LEN);
-	client->Socket = s;
-	client->Function = req->Function;
-	client->state = CLIENT_UNBOUND;
-	client->next = s->clients;
-	s->clients = client;
-	ds_dbg(1, "%s: bind_device(): client 0x%p, dev %s\n",
-		cs_socket_name(client->Socket), client, client->dev_info);
-	return CS_SUCCESS;
-} /* bind_device */
-
 /* String tables for error messages */
 
 typedef struct lookup_t {
@@ -528,79 +491,89 @@ static int bind_mtd(struct pcmcia_bus_so
 
 /*======================================================================
 
+    bind_request() and bind_device() are merged by now. Individual
+    descriptions:
+
     bind_request() connects a socket to a particular client driver.
     It looks up the specified device ID in the list of registered
     drivers, binds it to the socket, and tries to create an instance
     of the device.  unbind_request() deletes a driver instance.
     
+    Bind_device() associates a device driver with a particular socket.
+    It is normally called by Driver Services after it has identified
+    a newly inserted card.  An instance of that driver will then be
+    eligible to register as a client of this socket.
+
 ======================================================================*/
 
 static int bind_request(struct pcmcia_bus_socket *s, bind_info_t *bind_info)
 {
-    struct pcmcia_driver *driver;
-    socket_bind_t *b;
-    bind_req_t bind_req;
-    int ret;
+	struct pcmcia_driver *driver;
+	socket_bind_t *b;
+	client_t *client;
 
-    if (!s)
-	    return -EINVAL;
+	if (!s)
+		return -EINVAL;
 
-    ds_dbg(2, "bind_request(%d, '%s')\n", s->parent->sock,
-	  (char *)bind_info->dev_info);
-    driver = get_pcmcia_driver(&bind_info->dev_info);
-    if (!driver)
-	    return -EINVAL;
+	ds_dbg(2, "bind_request(%d, '%s')\n", s->parent->sock,
+	       (char *)bind_info->dev_info);
+	driver = get_pcmcia_driver(&bind_info->dev_info);
+	if (!driver)
+		return -EINVAL;
 
-    for (b = s->bind; b; b = b->next)
-	if ((driver == b->driver) &&
-	    (bind_info->function == b->function))
-	    break;
-    if (b != NULL) {
-	bind_info->instance = b->instance;
-	return -EBUSY;
-    }
+	for (b = s->bind; b; b = b->next)
+		if ((driver == b->driver) &&
+		    (bind_info->function == b->function))
+			break;
+	if (b != NULL) {
+		bind_info->instance = b->instance;
+		return -EBUSY;
+	}
 
-    if (!try_module_get(driver->owner))
-	    return -EINVAL;
+	if (!try_module_get(driver->owner))
+		return -EINVAL;
 
-    bind_req.Socket = s->parent;
-    bind_req.Function = bind_info->function;
-    bind_req.dev_info = (dev_info_t *) driver->drv.name;
-    ret = pcmcia_bind_device(&bind_req);
-    if (ret != CS_SUCCESS) {
-	cs_error(NULL, BindDevice, ret);
-	printk(KERN_NOTICE "ds: unable to bind '%s' to socket %d\n",
-	       (char *)dev_info, s->parent->sock);
-	module_put(driver->owner);
-	return -ENODEV;
-    }
+	client = (client_t *) kmalloc(sizeof(client_t), GFP_KERNEL);
+	if (!client) {
+		module_put(driver->owner);
+		return -ENOMEM;
+	}
+	memset(client, 0, sizeof(client_t));
 
-    /* Add binding to list for this socket */
-    driver->use_count++;
-    b = kmalloc(sizeof(socket_bind_t), GFP_KERNEL);
-    if (!b) 
-    {
-    	driver->use_count--;
-	module_put(driver->owner);
-	return -ENOMEM;    
-    }
-    b->driver = driver;
-    b->function = bind_info->function;
-    b->instance = NULL;
-    b->next = s->bind;
-    s->bind = b;
-    
-    if (driver->attach) {
-	b->instance = driver->attach();
-	if (b->instance == NULL) {
-	    printk(KERN_NOTICE "ds: unable to create instance "
-		   "of '%s'!\n", (char *)bind_info->dev_info);
-	    module_put(driver->owner);
-	    return -ENODEV;
+	client->client_magic = CLIENT_MAGIC;
+	client->Socket = s->parent;
+	client->Function = bind_info->function;
+	client->state = CLIENT_UNBOUND;
+	client->next = s->parent->clients;
+	strlcpy(client->dev_info, driver->drv.name, DEV_NAME_LEN);
+	s->parent->clients = client;
+
+	/* Add binding to list for this socket */
+	b = kmalloc(sizeof(socket_bind_t), GFP_KERNEL);
+	if (!b)
+	{
+		module_put(driver->owner);
+		return -ENOMEM;
+	}
+	b->driver = driver;
+	b->function = bind_info->function;
+	b->instance = NULL;
+	b->next = s->bind;
+	s->bind = b;
+
+	driver->use_count++;
+	if (driver->attach) {
+		b->instance = driver->attach();
+		if (b->instance == NULL) {
+			printk(KERN_NOTICE "ds: unable to create instance "
+			       "of '%s'!\n", (char *)bind_info->dev_info);
+			module_put(driver->owner);
+			/* FIXME: client isn't freed here */
+			return -ENODEV;
+		}
 	}
-    }
     
-    return 0;
+	return 0;
 } /* bind_request */
 
 /*====================================================================*/
diff -puN include/pcmcia/cs.h~pcmcia-unfiy-bind_device-and-pcmcia_bind_device include/pcmcia/cs.h
--- 25/include/pcmcia/cs.h~pcmcia-unfiy-bind_device-and-pcmcia_bind_device	2004-12-03 18:44:25.111965600 -0800
+++ 25-akpm/include/pcmcia/cs.h	2004-12-03 18:44:25.116964840 -0800
@@ -315,13 +315,6 @@ typedef struct error_info_t {
     int		retcode;
 } error_info_t;
 
-/* Special stuff for binding drivers to sockets */
-typedef struct bind_req_t {
-    struct pcmcia_socket	*Socket;
-    u_char	Function;
-    dev_info_t	*dev_info;
-} bind_req_t;
-
 /* Flag to bind to all functions */
 #define BIND_FN_ALL	0xff
 
@@ -413,6 +406,8 @@ enum service {
     GetFirstWindow, GetNextWindow, GetMemPage
 };
 
+struct pcmcia_socket;
+
 int pcmcia_access_configuration_register(client_handle_t handle, conf_reg_t *reg);
 int pcmcia_deregister_client(client_handle_t handle);
 int pcmcia_get_configuration_info(client_handle_t handle, config_info_t *config);
_
