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

Commit 924e1d49 authored by Russell King's avatar Russell King
Browse files

ARM: sa1111: cleanup sub-device registration and unregistration 



Move the releasing of resources out of the release function - this
allows a cleaner and more conventional arrangement of the registration
failure paths and a saner unregistration process for these devices.

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 21d1c770

arch/arm/common/sa1111.c

+16 −11
Original line number Original line Diff line number Diff line
@@ -610,7 +610,6 @@ static void sa1111_dev_release(struct device *_dev) 
{

{

	struct sa1111_dev *dev = SA1111_DEV(_dev);

	struct sa1111_dev *dev = SA1111_DEV(_dev);





	release_resource(&dev->res);

	kfree(dev);

	kfree(dev);

}

}
@@ -625,9 +624,10 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, 
	dev = kzalloc(sizeof(struct sa1111_dev), GFP_KERNEL);

	dev = kzalloc(sizeof(struct sa1111_dev), GFP_KERNEL);

	if (!dev) {

	if (!dev) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto out;

		goto err_alloc;

	}

	}





	device_initialize(&dev->dev);

	dev_set_name(&dev->dev, "%4.4lx", info->offset);

	dev_set_name(&dev->dev, "%4.4lx", info->offset);

	dev->devid	 = info->devid;

	dev->devid	 = info->devid;

	dev->dev.parent  = sachip->dev;

	dev->dev.parent  = sachip->dev;
@@ -657,17 +657,19 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, 
	if (ret) {

	if (ret) {

		printk("SA1111: failed to allocate resource for %s\n",

		printk("SA1111: failed to allocate resource for %s\n",

			dev->res.name);

			dev->res.name);

		dev_set_name(&dev->dev, NULL);

		goto err_resource;

		kfree(dev);

		goto out;

	}

	}





	ret = device_register(&dev->dev);

	ret = device_add(&dev->dev);

	if (ret) {

	if (ret)

		release_resource(&dev->res);

		goto err_add;

		kfree(dev);

	return 0;

	}





 err_add:

	release_resource(&dev->res);

 err_resource:

	put_device(&dev->dev);

 err_alloc:

	return ret;

	return ret;

}

}
@@ -813,7 +815,10 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) 




static int sa1111_remove_one(struct device *dev, void *data)

static int sa1111_remove_one(struct device *dev, void *data)

{

{

	device_unregister(dev);

	struct sa1111_dev *sadev = SA1111_DEV(dev);

	device_del(&sadev->dev);

	release_resource(&sadev->res);

	put_device(&sadev->dev);

	return 0;

	return 0;

}

}