Unverified Commit 59ebbe40 authored by Tian Tao's avatar Tian Tao Committed by Mark Brown
Browse files

spi: simplify devm_spi_register_controller 



Use devm_add_action_or_reset() instead of devres_alloc() and
devres_add(), which works the same. This will simplify the
code. There is no functional changes.

Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
Signed-off-by: default avatarYicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/1617843307-53853-1-git-send-email-tiantao6@hisilicon.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9b844b08

drivers/spi/spi.c

+5 −14
Original line number Diff line number Diff line
@@ -2793,9 +2793,9 @@ int spi_register_controller(struct spi_controller *ctlr) 
}

EXPORT_SYMBOL_GPL(spi_register_controller);



static void devm_spi_unregister(struct device *dev, void *res)

static void devm_spi_unregister(void *ctlr)

{

	spi_unregister_controller(*(struct spi_controller **)res);

	spi_unregister_controller(ctlr);

}



/**
@@ -2814,22 +2814,13 @@ static void devm_spi_unregister(struct device *dev, void *res) 
int devm_spi_register_controller(struct device *dev,

				 struct spi_controller *ctlr)

{

	struct spi_controller **ptr;

	int ret;



	ptr = devres_alloc(devm_spi_unregister, sizeof(*ptr), GFP_KERNEL);

	if (!ptr)

		return -ENOMEM;



	ret = spi_register_controller(ctlr);

	if (!ret) {

		*ptr = ctlr;

		devres_add(dev, ptr);

	} else {

		devres_free(ptr);

	}



	if (ret)

		return ret;



	return devm_add_action_or_reset(dev, devm_spi_unregister, ctlr);

}

EXPORT_SYMBOL_GPL(devm_spi_register_controller);