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

Commit 38ca6c34 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Driver core: convert raw device code to use struct device 



Converts from using struct "class_device" to "struct device" making
everything show up properly in /sys/devices/ with symlinks from the
/sys/class directory.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 01107d34

drivers/char/raw.c

+6 −6
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ raw_ioctl(struct inode *inode, struct file *filp, 


static void bind_device(struct raw_config_request *rq)

{

	class_device_destroy(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor));

	class_device_create(raw_class, NULL, MKDEV(RAW_MAJOR, rq->raw_minor),

				      NULL, "raw%d", rq->raw_minor);

	device_destroy(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor));

	device_create(raw_class, NULL, MKDEV(RAW_MAJOR, rq->raw_minor),

		      "raw%d", rq->raw_minor);

}



/*
@@ -200,7 +200,7 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp, 
			if (rq.block_major == 0 && rq.block_minor == 0) {

				/* unbind */

				rawdev->binding = NULL;

				class_device_destroy(raw_class,

				device_destroy(raw_class,

						MKDEV(RAW_MAJOR, rq.raw_minor));

			} else {

				rawdev->binding = bdget(dev);
@@ -283,7 +283,7 @@ static int __init raw_init(void) 
		ret = PTR_ERR(raw_class);

		goto error_region;

	}

	class_device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");

	device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), "rawctl");



	return 0;
@@ -295,7 +295,7 @@ error: 


static void __exit raw_exit(void)

{

	class_device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));

	device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));

	class_destroy(raw_class);

	cdev_del(&raw_cdev);

	unregister_chrdev_region(MKDEV(RAW_MAJOR, 0), MAX_RAW_MINORS);