Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f71674a0 authored May 21, 2008 by Greg Kroah-Hartman

device create: ieee1394: convert device_create to device_create_drvdata



device_create() is race-prone, so use the race-free
device_create_drvdata() instead as device_create() is going away.

Cc: Ben Collins <ben.collins@ubuntu.com>
Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 6ecaaf94

drivers/ieee1394/dv1394.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -2296,8 +2296,9 @@ static void dv1394_add_host(struct hpsb_host *host)

		ohci = (struct ti_ohci *)host->hostdata;

		device_create(hpsb_protocol_class, NULL, MKDEV(
		IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)),
		device_create_drvdata(hpsb_protocol_class, NULL,
		MKDEV(IEEE1394_MAJOR,
		IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), NULL,
		"dv1394-%d", id);

		dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE);

drivers/ieee1394/raw1394.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3010,10 +3010,10 @@ static int __init init_raw1394(void)
		hpsb_register_highlevel(&raw1394_highlevel);

		if (IS_ERR
		(device_create(
		(device_create_drvdata(
		hpsb_protocol_class, NULL,
		MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),
		RAW1394_DEVICE_NAME))) {
		NULL, RAW1394_DEVICE_NAME))) {
		ret = -EFAULT;
		goto out_unreg;
		}

drivers/ieee1394/video1394.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1341,8 +1341,8 @@ static void video1394_add_host (struct hpsb_host *host)
		hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->host->id);

		minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id;
		device_create(hpsb_protocol_class, NULL,
		MKDEV(IEEE1394_MAJOR, minor),
		device_create_drvdata(hpsb_protocol_class, NULL,
		MKDEV(IEEE1394_MAJOR, minor), NULL,
		"%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
		}