dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Dmitry Torokhov 2005-09-15 02:01:36 -05:00 committed by Greg Kroah-Hartman
parent 7bd7b09142
commit d8539d81ae
6 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/base/class.c
View File

@ -532,7 +532,7 @@ int class_device_add(struct class_device *class_dev)
list_add_tail(&class_dev->node, &parent->children);
list_for_each_entry(class_intf, &parent->interfaces, node)
if (class_intf->add)
class_intf->add(class_dev);
class_intf->add(class_dev, class_intf);
up(&parent->sem);
}
@ -612,7 +612,7 @@ void class_device_del(struct class_device *class_dev)
list_del_init(&class_dev->node);
list_for_each_entry(class_intf, &parent->interfaces, node)
if (class_intf->remove)
class_intf->remove(class_dev);
class_intf->remove(class_dev, class_intf);
up(&parent->sem);
}
@ -729,7 +729,7 @@ int class_interface_register(struct class_interface *class_intf)
list_add_tail(&class_intf->node, &parent->interfaces);
if (class_intf->add) {
list_for_each_entry(class_dev, &parent->children, node)
class_intf->add(class_dev);
class_intf->add(class_dev, class_intf);
}
up(&parent->sem);
@ -748,7 +748,7 @@ void class_interface_unregister(struct class_interface *class_intf)
list_del_init(&class_intf->node);
if (class_intf->remove) {
list_for_each_entry(class_dev, &parent->children, node)
class_intf->remove(class_dev);
class_intf->remove(class_dev, class_intf);
}
up(&parent->sem);

6
drivers/pcmcia/ds.c
View File

@ -1157,7 +1157,8 @@ static struct pcmcia_callback pcmcia_bus_callback = {
.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);
int ret;
@ -1192,7 +1193,8 @@ 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)
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);

6
drivers/pcmcia/rsrc_nonstatic.c
View File

@ -994,7 +994,8 @@ static struct class_device_attribute *pccard_rsrc_attributes[] = {
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 class_device_attribute **attr;
@ -1011,7 +1012,8 @@ static int __devinit pccard_sysfs_add_rsrc(struct class_device *class_dev)
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 class_device_attribute **attr;

6
drivers/pcmcia/socket_sysfs.c
View File

@ -341,7 +341,8 @@ static struct bin_attribute pccard_cis_attr = {
.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;
int ret = 0;
@ -357,7 +358,8 @@ static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev)
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;

8
drivers/scsi/sg.c
View File

@ -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 */
static int sg_add(struct class_device *);
static void sg_remove(struct class_device *);
static int sg_add(struct class_device *, struct class_interface *);
static void sg_remove(struct class_device *, struct class_interface *);
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
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 gendisk *disk;
@ -1582,7 +1582,7 @@ out:
}
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);
Sg_device *sdp = NULL;

4
include/linux/device.h
View File

@ -251,8 +251,8 @@ struct class_interface {
struct list_head node;
struct class *class;
int (*add) (struct class_device *);
void (*remove) (struct class_device *);
int (*add) (struct class_device *, struct class_interface *);
void (*remove) (struct class_device *, struct class_interface *);
};
extern int class_interface_register(struct class_interface *);