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

device create: block: convert device_create_drvdata to device_create

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

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+12 -17
+1 -2
block/bsg.c
··· 1024 1024 bcd->release = release; 1025 1025 kref_init(&bcd->ref); 1026 1026 dev = MKDEV(bsg_major, bcd->minor); 1027 - class_dev = device_create_drvdata(bsg_class, parent, dev, NULL, 1028 - "%s", devname); 1027 + class_dev = device_create(bsg_class, parent, dev, NULL, "%s", devname); 1029 1028 if (IS_ERR(class_dev)) { 1030 1029 ret = PTR_ERR(class_dev); 1031 1030 goto put_dev;
+3 -3
drivers/block/aoe/aoechr.c
··· 284 284 return PTR_ERR(aoe_class); 285 285 } 286 286 for (i = 0; i < ARRAY_SIZE(chardevs); ++i) 287 - device_create_drvdata(aoe_class, NULL, 288 - MKDEV(AOE_MAJOR, chardevs[i].minor), 289 - NULL, chardevs[i].name); 287 + device_create(aoe_class, NULL, 288 + MKDEV(AOE_MAJOR, chardevs[i].minor), NULL, 289 + chardevs[i].name); 290 290 291 291 return 0; 292 292 }
+2 -3
drivers/block/paride/pg.c
··· 686 686 for (unit = 0; unit < PG_UNITS; unit++) { 687 687 struct pg *dev = &devices[unit]; 688 688 if (dev->present) 689 - device_create_drvdata(pg_class, NULL, 690 - MKDEV(major, unit), NULL, 691 - "pg%u", unit); 689 + device_create(pg_class, NULL, MKDEV(major, unit), NULL, 690 + "pg%u", unit); 692 691 } 693 692 err = 0; 694 693 goto out;
+4 -6
drivers/block/paride/pt.c
··· 979 979 980 980 for (unit = 0; unit < PT_UNITS; unit++) 981 981 if (pt[unit].present) { 982 - device_create_drvdata(pt_class, NULL, 983 - MKDEV(major, unit), NULL, 984 - "pt%d", unit); 985 - device_create_drvdata(pt_class, NULL, 986 - MKDEV(major, unit + 128), NULL, 987 - "pt%dn", unit); 982 + device_create(pt_class, NULL, MKDEV(major, unit), NULL, 983 + "pt%d", unit); 984 + device_create(pt_class, NULL, MKDEV(major, unit + 128), 985 + NULL, "pt%dn", unit); 988 986 } 989 987 goto out; 990 988
+2 -3
drivers/block/pktcdvd.c
··· 302 302 static void pkt_sysfs_dev_new(struct pktcdvd_device *pd) 303 303 { 304 304 if (class_pktcdvd) { 305 - pd->dev = device_create_drvdata(class_pktcdvd, NULL, 306 - pd->pkt_dev, NULL, 307 - "%s", pd->name); 305 + pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, NULL, 306 + "%s", pd->name); 308 307 if (IS_ERR(pd->dev)) 309 308 pd->dev = NULL; 310 309 }