niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

spi: simplify devm_spi_register_controller

Browse source 
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: Tian Tao <tiantao6@hisilicon.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/1617843307-53853-1-git-send-email-tiantao6@hisilicon.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Tian Tao 2021-04-08 08:55:07 +08:00 • committed by Mark Brown
parent 9b844b0871
commit 59ebbe40fb
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/spi/spi.c
View file

@ -2793,9 +2793,9 @@ free_bus_id:
} }
EXPORT_SYMBOL_GPL(spi_register_controller); 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, int devm_spi_register_controller(struct device *dev,
struct spi_controller *ctlr) struct spi_controller *ctlr)
{ {
struct spi_controller **ptr;
int ret; int ret;
ptr = devres_alloc(devm_spi_unregister, sizeof(*ptr), GFP_KERNEL);
if (!ptr)
return -ENOMEM;
ret = spi_register_controller(ctlr); ret = spi_register_controller(ctlr);
if (!ret) { if (ret)
*ptr = ctlr; return ret;
devres_add(dev, ptr);
} else {
devres_free(ptr);
}
return ret; return devm_add_action_or_reset(dev, devm_spi_unregister, ctlr);
} }
EXPORT_SYMBOL_GPL(devm_spi_register_controller); EXPORT_SYMBOL_GPL(devm_spi_register_controller);