Commit d73a1a67 authored Jul 21, 2008 by Greg Kroah-Hartman

device create: scsi: convert device_create_drvdata to device_create



Now that device_create() has been audited, rename things back to the
original call to be sane.

Cc: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent ea9e42f6

drivers/scsi/ch.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -914,9 +914,9 @@ static int ch_probe(struct device *dev)
		ch->minor = minor;
		sprintf(ch->name,"ch%d",ch->minor);

		class_dev = device_create_drvdata(ch_sysfs_class, dev,
		MKDEV(SCSI_CHANGER_MAJOR, ch->minor),
		ch, "s%s", ch->name);
		class_dev = device_create(ch_sysfs_class, dev,
		MKDEV(SCSI_CHANGER_MAJOR, ch->minor), ch,
		"s%s", ch->name);
		if (IS_ERR(class_dev)) {
		printk(KERN_WARNING "ch%d: device_create failed\n",
		ch->minor);

drivers/scsi/dpt_i2o.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -271,7 +271,7 @@ static int adpt_detect(struct scsi_host_template* sht)
		pHba->initialized = TRUE;
		pHba->state &= ~DPTI_STATE_RESET;
		if (adpt_sysfs_class) {
		struct device *dev = device_create_drvdata(adpt_sysfs_class,
		struct device *dev = device_create(adpt_sysfs_class,
		NULL, MKDEV(DPTI_I2O_MAJOR, pHba->unit), NULL,
		"dpti%d", pHba->unit);
		if (IS_ERR(dev)) {

drivers/scsi/osst.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -5708,7 +5708,8 @@ static int osst_sysfs_add(dev_t dev, struct device device, struct osst_tape S
		struct device *osst_member;
		int err;

		osst_member = device_create_drvdata(osst_sysfs_class, device, dev, STp, "%s", name);
		osst_member = device_create(osst_sysfs_class, device, dev, STp,
		"%s", name);
		if (IS_ERR(osst_member)) {
		printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name);
		return PTR_ERR(osst_member);

drivers/scsi/sg.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1450,12 +1450,10 @@ sg_add(struct device cl_dev, struct class_interface cl_intf)
		if (sg_sysfs_valid) {
		struct device *sg_class_member;

		sg_class_member = device_create_drvdata(sg_sysfs_class,
		cl_dev->parent,
		sg_class_member = device_create(sg_sysfs_class, cl_dev->parent,
		MKDEV(SCSI_GENERIC_MAJOR,
		sdp->index),
		sdp,
		"%s", disk->disk_name);
		sdp, "%s", disk->disk_name);
		if (IS_ERR(sg_class_member)) {
		printk(KERN_ERR "sg_add: "
		"device_create failed\n");

drivers/scsi/st.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -4428,13 +4428,10 @@ static int do_create_class_files(struct scsi_tape *STp, int dev_num, int mode)
		snprintf(name, 10, "%s%s%s", rew ? "n" : "",
		STp->disk->disk_name, st_formats[i]);
		st_class_member =
		device_create_drvdata(st_sysfs_class,
		&STp->device->sdev_gendev,
		device_create(st_sysfs_class, &STp->device->sdev_gendev,
		MKDEV(SCSI_TAPE_MAJOR,
		TAPE_MINOR(dev_num,
		mode, rew)),
		&STp->modes[mode],
		"%s", name);
		TAPE_MINOR(dev_num, mode, rew)),
		&STp->modes[mode], "%s", name);
		if (IS_ERR(st_class_member)) {
		printk(KERN_WARNING "st%d: device_create failed\n",
		dev_num);