tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Greg Kroah-Hartman d73a1a67 ea9e42f6

+14 -18
+3 -3
drivers/scsi/ch.c
··· 914 914 ch->minor = minor; 915 915 sprintf(ch->name,"ch%d",ch->minor); 916 916 917 - class_dev = device_create_drvdata(ch_sysfs_class, dev, 918 - MKDEV(SCSI_CHANGER_MAJOR, ch->minor), 919 - ch, "s%s", ch->name); 917 + class_dev = device_create(ch_sysfs_class, dev, 918 + MKDEV(SCSI_CHANGER_MAJOR, ch->minor), ch, 919 + "s%s", ch->name); 920 920 if (IS_ERR(class_dev)) { 921 921 printk(KERN_WARNING "ch%d: device_create failed\n", 922 922 ch->minor);
+1 -1
drivers/scsi/dpt_i2o.c
··· 271 271 pHba->initialized = TRUE; 272 272 pHba->state &= ~DPTI_STATE_RESET; 273 273 if (adpt_sysfs_class) { 274 - struct device *dev = device_create_drvdata(adpt_sysfs_class, 274 + struct device *dev = device_create(adpt_sysfs_class, 275 275 NULL, MKDEV(DPTI_I2O_MAJOR, pHba->unit), NULL, 276 276 "dpti%d", pHba->unit); 277 277 if (IS_ERR(dev)) {
+2 -1
drivers/scsi/osst.c
··· 5708 5708 struct device *osst_member; 5709 5709 int err; 5710 5710 5711 - osst_member = device_create_drvdata(osst_sysfs_class, device, dev, STp, "%s", name); 5711 + osst_member = device_create(osst_sysfs_class, device, dev, STp, 5712 + "%s", name); 5712 5713 if (IS_ERR(osst_member)) { 5713 5714 printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name); 5714 5715 return PTR_ERR(osst_member);
+4 -6
drivers/scsi/sg.c
··· 1450 1450 if (sg_sysfs_valid) { 1451 1451 struct device *sg_class_member; 1452 1452 1453 - sg_class_member = device_create_drvdata(sg_sysfs_class, 1454 - cl_dev->parent, 1455 - MKDEV(SCSI_GENERIC_MAJOR, 1456 - sdp->index), 1457 - sdp, 1458 - "%s", disk->disk_name); 1453 + sg_class_member = device_create(sg_sysfs_class, cl_dev->parent, 1454 + MKDEV(SCSI_GENERIC_MAJOR, 1455 + sdp->index), 1456 + sdp, "%s", disk->disk_name); 1459 1457 if (IS_ERR(sg_class_member)) { 1460 1458 printk(KERN_ERR "sg_add: " 1461 1459 "device_create failed\n");
+4 -7
drivers/scsi/st.c
··· 4428 4428 snprintf(name, 10, "%s%s%s", rew ? "n" : "", 4429 4429 STp->disk->disk_name, st_formats[i]); 4430 4430 st_class_member = 4431 - device_create_drvdata(st_sysfs_class, 4432 - &STp->device->sdev_gendev, 4433 - MKDEV(SCSI_TAPE_MAJOR, 4434 - TAPE_MINOR(dev_num, 4435 - mode, rew)), 4436 - &STp->modes[mode], 4437 - "%s", name); 4431 + device_create(st_sysfs_class, &STp->device->sdev_gendev, 4432 + MKDEV(SCSI_TAPE_MAJOR, 4433 + TAPE_MINOR(dev_num, mode, rew)), 4434 + &STp->modes[mode], "%s", name); 4438 4435 if (IS_ERR(st_class_member)) { 4439 4436 printk(KERN_WARNING "st%d: device_create failed\n", 4440 4437 dev_num);