github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

spi: Simplify devm_spi_*_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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20260108175145.3535441-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2026-01-08 18:51:45 +01:00 committed by Mark Brown
parent 19a4505a7a
commit b6376dbed8
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/spi/spi.c
View File

@ -3079,9 +3079,9 @@ struct spi_controller *__spi_alloc_controller(struct device *dev,
} }
EXPORT_SYMBOL_GPL(__spi_alloc_controller); EXPORT_SYMBOL_GPL(__spi_alloc_controller);
static void devm_spi_release_controller(struct device *dev, void *ctlr) static void devm_spi_release_controller(void *ctlr)
{ {
spi_controller_put(*(struct spi_controller **)ctlr); spi_controller_put(ctlr);
} }
/** /**
@ -3103,21 +3103,18 @@ struct spi_controller *__devm_spi_alloc_controller(struct device *dev,
unsigned int size, unsigned int size,
bool target) bool target)
{ {
struct spi_controller **ptr, *ctlr; struct spi_controller *ctlr;
int ret;
ptr = devres_alloc(devm_spi_release_controller, sizeof(*ptr),
GFP_KERNEL);
if (!ptr)
return NULL;
ctlr = __spi_alloc_controller(dev, size, target); ctlr = __spi_alloc_controller(dev, size, target);
if (ctlr) { if (!ctlr)
ctlr->devm_allocated = true; return NULL;
*ptr = ctlr;
devres_add(dev, ptr); ret = devm_add_action_or_reset(dev, devm_spi_release_controller, ctlr);
} else { if (ret)
devres_free(ptr); return NULL;
}
ctlr->devm_allocated = true;
return ctlr; return ctlr;
} }
@ -3378,9 +3375,9 @@ int spi_register_controller(struct spi_controller *ctlr)
} }
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_controller(void *ctlr)
{ {
spi_unregister_controller(*(struct spi_controller **)res); spi_unregister_controller(ctlr);
} }
/** /**
@ -3398,22 +3395,14 @@ 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 { return devm_add_action_or_reset(dev, devm_spi_unregister_controller, ctlr);
devres_free(ptr);
}
return ret;
} }
EXPORT_SYMBOL_GPL(devm_spi_register_controller); EXPORT_SYMBOL_GPL(devm_spi_register_controller);