diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 01:25:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 12:52:52 -0400 |
commit | 53f4654272df7c51064825024340554b39c9efba (patch) | |
tree | e3e7b82a6bb0040ffbd267b250be2720704b98f2 /drivers/scsi | |
parent | 51d172d5f3a193e4b8f76179b2e55d7a36b94117 (diff) |
[PATCH] Driver Core: fix up all callers of class_device_create()
The previous patch adding the ability to nest struct class_device
changed the paramaters to the call class_device_create(). This patch
fixes up all in-kernel users of the function.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/ch.c | 2 | ||||
-rw-r--r-- | drivers/scsi/osst.c | 2 | ||||
-rw-r--r-- | drivers/scsi/sg.c | 2 | ||||
-rw-r--r-- | drivers/scsi/st.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index da6e51c7fe69..540147cb51ce 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c | |||
@@ -936,7 +936,7 @@ static int ch_probe(struct device *dev) | |||
936 | if (init) | 936 | if (init) |
937 | ch_init_elem(ch); | 937 | ch_init_elem(ch); |
938 | 938 | ||
939 | class_device_create(ch_sysfs_class, | 939 | class_device_create(ch_sysfs_class, NULL, |
940 | MKDEV(SCSI_CHANGER_MAJOR,ch->minor), | 940 | MKDEV(SCSI_CHANGER_MAJOR,ch->minor), |
941 | dev, "s%s", ch->name); | 941 | dev, "s%s", ch->name); |
942 | 942 | ||
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 3f2f2464fa63..0bb60de0bded 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
@@ -5627,7 +5627,7 @@ static void osst_sysfs_add(dev_t dev, struct device *device, struct osst_tape * | |||
5627 | 5627 | ||
5628 | if (!osst_sysfs_valid) return; | 5628 | if (!osst_sysfs_valid) return; |
5629 | 5629 | ||
5630 | osst_class_member = class_device_create(osst_sysfs_class, dev, device, "%s", name); | 5630 | osst_class_member = class_device_create(osst_sysfs_class, NULL, dev, device, "%s", name); |
5631 | if (IS_ERR(osst_class_member)) { | 5631 | if (IS_ERR(osst_class_member)) { |
5632 | printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name); | 5632 | printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name); |
5633 | return; | 5633 | return; |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index f0d8b4eda5ad..40886e1c9616 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -1550,7 +1550,7 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf) | |||
1550 | if (sg_sysfs_valid) { | 1550 | if (sg_sysfs_valid) { |
1551 | struct class_device * sg_class_member; | 1551 | struct class_device * sg_class_member; |
1552 | 1552 | ||
1553 | sg_class_member = class_device_create(sg_sysfs_class, | 1553 | sg_class_member = class_device_create(sg_sysfs_class, NULL, |
1554 | MKDEV(SCSI_GENERIC_MAJOR, k), | 1554 | MKDEV(SCSI_GENERIC_MAJOR, k), |
1555 | cl_dev->dev, "%s", | 1555 | cl_dev->dev, "%s", |
1556 | disk->disk_name); | 1556 | disk->disk_name); |
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index d001c046551b..d45ba4832162 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
@@ -4375,7 +4375,7 @@ static void do_create_class_files(struct scsi_tape *STp, int dev_num, int mode) | |||
4375 | snprintf(name, 10, "%s%s%s", rew ? "n" : "", | 4375 | snprintf(name, 10, "%s%s%s", rew ? "n" : "", |
4376 | STp->disk->disk_name, st_formats[i]); | 4376 | STp->disk->disk_name, st_formats[i]); |
4377 | st_class_member = | 4377 | st_class_member = |
4378 | class_device_create(st_sysfs_class, | 4378 | class_device_create(st_sysfs_class, NULL, |
4379 | MKDEV(SCSI_TAPE_MAJOR, | 4379 | MKDEV(SCSI_TAPE_MAJOR, |
4380 | TAPE_MINOR(dev_num, mode, rew)), | 4380 | TAPE_MINOR(dev_num, mode, rew)), |
4381 | &STp->device->sdev_gendev, "%s", name); | 4381 | &STp->device->sdev_gendev, "%s", name); |