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

Commit 514b82a5 authored by Pawel Moll's avatar Pawel Moll Committed by Chris Metcalf
Browse files

char: tile-srom: Add real platform bus parent 



Add a real platform bus device as a parent for
the srom class devices, to prevent non-platform
devices hanging from the bus root.

Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent 4cde4cc8

drivers/char/tile-srom.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -76,6 +76,7 @@ MODULE_LICENSE("GPL"); 




static int srom_devs;			/* Number of SROM partitions */

static int srom_devs;			/* Number of SROM partitions */

static struct cdev srom_cdev;

static struct cdev srom_cdev;

static struct platform_device *srom_parent;

static struct class *srom_class;

static struct class *srom_class;

static struct srom_dev *srom_devices;

static struct srom_dev *srom_devices;
@@ -350,7 +351,7 @@ static int srom_setup_minor(struct srom_dev *srom, int index) 
		       SROM_PAGE_SIZE_OFF, sizeof(srom->page_size)) < 0)

		       SROM_PAGE_SIZE_OFF, sizeof(srom->page_size)) < 0)

		return -EIO;

		return -EIO;





	dev = device_create(srom_class, &platform_bus,

	dev = device_create(srom_class, &srom_parent->dev,

			    MKDEV(srom_major, index), srom, "%d", index);

			    MKDEV(srom_major, index), srom, "%d", index);

	return PTR_ERR_OR_ZERO(dev);

	return PTR_ERR_OR_ZERO(dev);

}

}
@@ -415,6 +416,13 @@ static int srom_init(void) 
	if (result < 0)

	if (result < 0)

		goto fail_chrdev;

		goto fail_chrdev;





	/* Create a parent device */

	srom_parent = platform_device_register_simple("srom", -1, NULL, 0);

	if (IS_ERR(srom_parent)) {

		result = PTR_ERR(srom_parent);

		goto fail_pdev;

	}



	/* Create a sysfs class. */

	/* Create a sysfs class. */

	srom_class = class_create(THIS_MODULE, "srom");

	srom_class = class_create(THIS_MODULE, "srom");

	if (IS_ERR(srom_class)) {

	if (IS_ERR(srom_class)) {
@@ -438,6 +446,8 @@ static int srom_init(void) 
		device_destroy(srom_class, MKDEV(srom_major, i));

		device_destroy(srom_class, MKDEV(srom_major, i));

	class_destroy(srom_class);

	class_destroy(srom_class);

fail_cdev:

fail_cdev:

	platform_device_unregister(srom_parent);

fail_pdev:

	cdev_del(&srom_cdev);

	cdev_del(&srom_cdev);

fail_chrdev:

fail_chrdev:

	unregister_chrdev_region(dev, srom_devs);

	unregister_chrdev_region(dev, srom_devs);
@@ -454,6 +464,7 @@ static void srom_cleanup(void) 
		device_destroy(srom_class, MKDEV(srom_major, i));

		device_destroy(srom_class, MKDEV(srom_major, i));

	class_destroy(srom_class);

	class_destroy(srom_class);

	cdev_del(&srom_cdev);

	cdev_del(&srom_cdev);

	platform_device_unregister(srom_parent);

	unregister_chrdev_region(MKDEV(srom_major, 0), srom_devs);

	unregister_chrdev_region(MKDEV(srom_major, 0), srom_devs);

	kfree(srom_devices);

	kfree(srom_devices);

}

}