Commit 90c6cdd1 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds
Browse files

[PATCH] pcmcia: clean up cs ds callback 



struct pcmcia_callback isn't needed for each socket, one is enough for all
sockets.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e7a480d2

drivers/pcmcia/ds.c

+7 −5
Original line number Diff line number Diff line
@@ -1167,6 +1167,12 @@ int pcmcia_deregister_client(client_handle_t handle) 
} /* deregister_client */

EXPORT_SYMBOL(pcmcia_deregister_client);



static struct pcmcia_callback pcmcia_bus_callback = {

	.owner = THIS_MODULE,

	.event = ds_event,

	.requery = pcmcia_bus_rescan,

};



static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev)

{

	struct pcmcia_socket *socket = class_get_devdata(class_dev);
@@ -1201,12 +1207,9 @@ static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev) 
	INIT_WORK(&s->device_add, pcmcia_delayed_add_pseudo_device, s);



	/* Set up hotline to Card Services */

	s->callback.owner = THIS_MODULE;

	s->callback.event = &ds_event;

	s->callback.requery = &pcmcia_bus_rescan;

	socket->pcmcia = s;



	ret = pccard_register_pcmcia(socket, &s->callback);

	ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);

	if (ret) {

		printk(KERN_ERR "PCMCIA registration PCCard core failed for socket %p\n", socket);

		pcmcia_put_bus_socket(s);
@@ -1217,7 +1220,6 @@ static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev) 
	return 0;

}





static void pcmcia_bus_remove_socket(struct class_device *class_dev)

{

	struct pcmcia_socket *socket = class_get_devdata(class_dev);

drivers/pcmcia/ds_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ struct user_info_t; 
/* Socket state information */

struct pcmcia_bus_socket {

	struct kref		refcount;

	struct pcmcia_callback	callback;

	int			state;

	struct pcmcia_socket	*parent;