Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8539d81 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman
Browse files

[PATCH] Driver core: pass interface to class interface methods 



Driver core: pass interface to class intreface methods

Pass interface as argument to add() and remove() class interface
methods. This way a subsystem can implement generic add/remove
handlers and then call interface-specific ones.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7bd7b091

drivers/base/class.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -532,7 +532,7 @@ int class_device_add(struct class_device *class_dev) 
		list_add_tail(&class_dev->node, &parent->children);

		list_add_tail(&class_dev->node, &parent->children);

		list_for_each_entry(class_intf, &parent->interfaces, node)

		list_for_each_entry(class_intf, &parent->interfaces, node)

			if (class_intf->add)

			if (class_intf->add)

				class_intf->add(class_dev);

				class_intf->add(class_dev, class_intf);

		up(&parent->sem);

		up(&parent->sem);

	}

	}
@@ -612,7 +612,7 @@ void class_device_del(struct class_device *class_dev) 
		list_del_init(&class_dev->node);

		list_del_init(&class_dev->node);

		list_for_each_entry(class_intf, &parent->interfaces, node)

		list_for_each_entry(class_intf, &parent->interfaces, node)

			if (class_intf->remove)

			if (class_intf->remove)

				class_intf->remove(class_dev);

				class_intf->remove(class_dev, class_intf);

		up(&parent->sem);

		up(&parent->sem);

	}

	}
@@ -729,7 +729,7 @@ int class_interface_register(struct class_interface *class_intf) 
	list_add_tail(&class_intf->node, &parent->interfaces);

	list_add_tail(&class_intf->node, &parent->interfaces);

	if (class_intf->add) {

	if (class_intf->add) {

		list_for_each_entry(class_dev, &parent->children, node)

		list_for_each_entry(class_dev, &parent->children, node)

			class_intf->add(class_dev);

			class_intf->add(class_dev, class_intf);

	}

	}

	up(&parent->sem);

	up(&parent->sem);
@@ -748,7 +748,7 @@ void class_interface_unregister(struct class_interface *class_intf) 
	list_del_init(&class_intf->node);

	list_del_init(&class_intf->node);

	if (class_intf->remove) {

	if (class_intf->remove) {

		list_for_each_entry(class_dev, &parent->children, node)

		list_for_each_entry(class_dev, &parent->children, node)

			class_intf->remove(class_dev);

			class_intf->remove(class_dev, class_intf);

	}

	}

	up(&parent->sem);

	up(&parent->sem);

drivers/pcmcia/ds.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1157,7 +1157,8 @@ static struct pcmcia_callback pcmcia_bus_callback = { 
	.requery = pcmcia_bus_rescan,

	.requery = pcmcia_bus_rescan,

};

};





static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev)

static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev,

					   struct class_interface *class_intf)

{

{

	struct pcmcia_socket *socket = class_get_devdata(class_dev);

	struct pcmcia_socket *socket = class_get_devdata(class_dev);

	int ret;

	int ret;
@@ -1192,7 +1193,8 @@ static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev) 
	return 0;

	return 0;

}

}





static void pcmcia_bus_remove_socket(struct class_device *class_dev)

static void pcmcia_bus_remove_socket(struct class_device *class_dev,

				     struct class_interface *class_intf)

{

{

	struct pcmcia_socket *socket = class_get_devdata(class_dev);

	struct pcmcia_socket *socket = class_get_devdata(class_dev);

drivers/pcmcia/rsrc_nonstatic.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -994,7 +994,8 @@ static struct class_device_attribute *pccard_rsrc_attributes[] = { 
	NULL,

	NULL,

};

};





static int __devinit pccard_sysfs_add_rsrc(struct class_device *class_dev)

static int __devinit pccard_sysfs_add_rsrc(struct class_device *class_dev,

					   struct class_interface *class_intf)

{

{

	struct pcmcia_socket *s = class_get_devdata(class_dev);

	struct pcmcia_socket *s = class_get_devdata(class_dev);

	struct class_device_attribute **attr;

	struct class_device_attribute **attr;
@@ -1011,7 +1012,8 @@ static int __devinit pccard_sysfs_add_rsrc(struct class_device *class_dev) 
	return ret;

	return ret;

}

}





static void __devexit pccard_sysfs_remove_rsrc(struct class_device *class_dev)

static void __devexit pccard_sysfs_remove_rsrc(struct class_device *class_dev,

					       struct class_interface *class_intf)

{

{

	struct pcmcia_socket *s = class_get_devdata(class_dev);

	struct pcmcia_socket *s = class_get_devdata(class_dev);

	struct class_device_attribute **attr;

	struct class_device_attribute **attr;

drivers/pcmcia/socket_sysfs.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -341,7 +341,8 @@ static struct bin_attribute pccard_cis_attr = { 
	.write = pccard_store_cis,

	.write = pccard_store_cis,

};

};





static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev)

static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev,

					     struct class_interface *class_intf)

{

{

	struct class_device_attribute **attr;

	struct class_device_attribute **attr;

	int ret = 0;

	int ret = 0;
@@ -357,7 +358,8 @@ static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev) 
	return ret;

	return ret;

}

}





static void __devexit pccard_sysfs_remove_socket(struct class_device *class_dev)

static void __devexit pccard_sysfs_remove_socket(struct class_device *class_dev,

						 struct class_interface *class_intf)

{

{

	struct class_device_attribute **attr;

	struct class_device_attribute **attr;

drivers/scsi/sg.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -104,8 +104,8 @@ static int sg_allow_dio = SG_ALLOW_DIO_DEF; 




#define SG_DEV_ARR_LUMP 32	/* amount to over allocate sg_dev_arr by */

#define SG_DEV_ARR_LUMP 32	/* amount to over allocate sg_dev_arr by */





static int sg_add(struct class_device *);

static int sg_add(struct class_device *, struct class_interface *);

static void sg_remove(struct class_device *);

static void sg_remove(struct class_device *, struct class_interface *);





static Scsi_Request *dummy_cmdp;	/* only used for sizeof */

static Scsi_Request *dummy_cmdp;	/* only used for sizeof */
@@ -1506,7 +1506,7 @@ static int sg_alloc(struct gendisk *disk, struct scsi_device *scsidp) 
}

}





static int

static int

sg_add(struct class_device *cl_dev)

sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)

{

{

	struct scsi_device *scsidp = to_scsi_device(cl_dev->dev);

	struct scsi_device *scsidp = to_scsi_device(cl_dev->dev);

	struct gendisk *disk;

	struct gendisk *disk;
@@ -1582,7 +1582,7 @@ sg_add(struct class_device *cl_dev) 
}

}





static void

static void

sg_remove(struct class_device *cl_dev)

sg_remove(struct class_device *cl_dev, struct class_interface *cl_intf)

{

{

	struct scsi_device *scsidp = to_scsi_device(cl_dev->dev);

	struct scsi_device *scsidp = to_scsi_device(cl_dev->dev);

	Sg_device *sdp = NULL;

	Sg_device *sdp = NULL;