mfd: ucb1x00-core: Rewrite ucb1x00_add_dev() (02a0bf6e) · Commits · 戴 / test

Error handling is on-its-head in this function. After invoking a function we should examine the return code and return the error value if there was one. Instead, this function checks for success and goes onto provide functionality if success was received. Not so bad in a simple function like this, but in a more complex one this could end up drowning in curly brackets. Signed-off-by:

Lee Jones <lee.jones@linaro.org>

drivers/mfd/ucb1x00-core.c

+15 −13

Original line number	Diff line number	Diff line
		@@ -393,22 +393,24 @@ static struct irq_chip ucb1x00_irqchip = {
		static int ucb1x00_add_dev(struct ucb1x00 ucb, struct ucb1x00_driver drv)
		{
		struct ucb1x00_dev *dev;
		int ret = -ENOMEM;
		int ret;

		dev = kmalloc(sizeof(struct ucb1x00_dev), GFP_KERNEL);
		if (dev) {
		if (!dev)
		return -ENOMEM;

		dev->ucb = ucb;
		dev->drv = drv;

		ret = drv->add(dev);
		if (ret) {
		kfree(dev);
		return ret;
		}

		if (ret == 0) {
		list_add_tail(&dev->dev_node, &ucb->devs);
		list_add_tail(&dev->drv_node, &drv->devs);
		} else {
		kfree(dev);
		}
		}

		return ret;
		}

Admin message