fpga: bridge: add devm_fpga_bridge_create
Add devm_fpga_bridge_create() which is the managed version of fpga_bridge_create(). Change current bridge drivers to use devm_fpga_bridge_create(). Signed-off-by: Alan Tull <atull@kernel.org> Suggested-by: Federico Vaga <federico.vaga@cern.ch> Acked-by: Moritz Fischer <mdf@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
084181fe8c
commit
213befe049
|
@ -10,6 +10,9 @@ API to implement a new FPGA bridge
|
||||||
.. kernel-doc:: include/linux/fpga/fpga-bridge.h
|
.. kernel-doc:: include/linux/fpga/fpga-bridge.h
|
||||||
:functions: fpga_bridge_ops
|
:functions: fpga_bridge_ops
|
||||||
|
|
||||||
|
.. kernel-doc:: drivers/fpga/fpga-bridge.c
|
||||||
|
:functions: devm_fpga_bridge_create
|
||||||
|
|
||||||
.. kernel-doc:: drivers/fpga/fpga-bridge.c
|
.. kernel-doc:: drivers/fpga/fpga-bridge.c
|
||||||
:functions: fpga_bridge_create
|
:functions: fpga_bridge_create
|
||||||
|
|
||||||
|
|
|
@ -121,18 +121,16 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
|
||||||
/* Get f2s bridge configuration saved in handoff register */
|
/* Get f2s bridge configuration saved in handoff register */
|
||||||
regmap_read(sysmgr, SYSMGR_ISWGRP_HANDOFF3, &priv->mask);
|
regmap_read(sysmgr, SYSMGR_ISWGRP_HANDOFF3, &priv->mask);
|
||||||
|
|
||||||
br = fpga_bridge_create(dev, F2S_BRIDGE_NAME,
|
br = devm_fpga_bridge_create(dev, F2S_BRIDGE_NAME,
|
||||||
&altera_fpga2sdram_br_ops, priv);
|
&altera_fpga2sdram_br_ops, priv);
|
||||||
if (!br)
|
if (!br)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, br);
|
platform_set_drvdata(pdev, br);
|
||||||
|
|
||||||
ret = fpga_bridge_register(br);
|
ret = fpga_bridge_register(br);
|
||||||
if (ret) {
|
if (ret)
|
||||||
fpga_bridge_free(br);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
|
||||||
|
|
||||||
dev_info(dev, "driver initialized with handoff %08x\n", priv->mask);
|
dev_info(dev, "driver initialized with handoff %08x\n", priv->mask);
|
||||||
|
|
||||||
|
|
|
@ -213,7 +213,6 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
|
||||||
struct fpga_bridge *br;
|
struct fpga_bridge *br;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
u32 status, revision;
|
u32 status, revision;
|
||||||
int ret;
|
|
||||||
|
|
||||||
if (!np)
|
if (!np)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -245,20 +244,14 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
priv->base_addr = base_addr;
|
priv->base_addr = base_addr;
|
||||||
|
|
||||||
br = fpga_bridge_create(dev, FREEZE_BRIDGE_NAME,
|
br = devm_fpga_bridge_create(dev, FREEZE_BRIDGE_NAME,
|
||||||
&altera_freeze_br_br_ops, priv);
|
&altera_freeze_br_br_ops, priv);
|
||||||
if (!br)
|
if (!br)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, br);
|
platform_set_drvdata(pdev, br);
|
||||||
|
|
||||||
ret = fpga_bridge_register(br);
|
return fpga_bridge_register(br);
|
||||||
if (ret) {
|
|
||||||
fpga_bridge_free(br);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int altera_freeze_br_remove(struct platform_device *pdev)
|
static int altera_freeze_br_remove(struct platform_device *pdev)
|
||||||
|
|
|
@ -180,7 +180,8 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
br = fpga_bridge_create(dev, priv->name, &altera_hps2fpga_br_ops, priv);
|
br = devm_fpga_bridge_create(dev, priv->name,
|
||||||
|
&altera_hps2fpga_br_ops, priv);
|
||||||
if (!br) {
|
if (!br) {
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto err;
|
goto err;
|
||||||
|
@ -190,12 +191,10 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
ret = fpga_bridge_register(br);
|
ret = fpga_bridge_register(br);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_free;
|
goto err;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_free:
|
|
||||||
fpga_bridge_free(br);
|
|
||||||
err:
|
err:
|
||||||
clk_disable_unprepare(priv->clk);
|
clk_disable_unprepare(priv->clk);
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,6 @@ static int fme_br_probe(struct platform_device *pdev)
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
struct fme_br_priv *priv;
|
struct fme_br_priv *priv;
|
||||||
struct fpga_bridge *br;
|
struct fpga_bridge *br;
|
||||||
int ret;
|
|
||||||
|
|
||||||
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
||||||
if (!priv)
|
if (!priv)
|
||||||
|
@ -69,18 +68,14 @@ static int fme_br_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
priv->pdata = dev_get_platdata(dev);
|
priv->pdata = dev_get_platdata(dev);
|
||||||
|
|
||||||
br = fpga_bridge_create(dev, "DFL FPGA FME Bridge",
|
br = devm_fpga_bridge_create(dev, "DFL FPGA FME Bridge",
|
||||||
&fme_bridge_ops, priv);
|
&fme_bridge_ops, priv);
|
||||||
if (!br)
|
if (!br)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, br);
|
platform_set_drvdata(pdev, br);
|
||||||
|
|
||||||
ret = fpga_bridge_register(br);
|
return fpga_bridge_register(br);
|
||||||
if (ret)
|
|
||||||
fpga_bridge_free(br);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fme_br_remove(struct platform_device *pdev)
|
static int fme_br_remove(struct platform_device *pdev)
|
||||||
|
|
|
@ -324,6 +324,9 @@ ATTRIBUTE_GROUPS(fpga_bridge);
|
||||||
* @br_ops: pointer to structure of fpga bridge ops
|
* @br_ops: pointer to structure of fpga bridge ops
|
||||||
* @priv: FPGA bridge private data
|
* @priv: FPGA bridge private data
|
||||||
*
|
*
|
||||||
|
* The caller of this function is responsible for freeing the bridge with
|
||||||
|
* fpga_bridge_free(). Using devm_fpga_bridge_create() instead is recommended.
|
||||||
|
*
|
||||||
* Return: struct fpga_bridge or NULL
|
* Return: struct fpga_bridge or NULL
|
||||||
*/
|
*/
|
||||||
struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
|
struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
|
||||||
|
@ -378,8 +381,8 @@ error_kfree:
|
||||||
EXPORT_SYMBOL_GPL(fpga_bridge_create);
|
EXPORT_SYMBOL_GPL(fpga_bridge_create);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* fpga_bridge_free - free a fpga bridge and its id
|
* fpga_bridge_free - free a fpga bridge created by fpga_bridge_create()
|
||||||
* @bridge: FPGA bridge struct created by fpga_bridge_create
|
* @bridge: FPGA bridge struct
|
||||||
*/
|
*/
|
||||||
void fpga_bridge_free(struct fpga_bridge *bridge)
|
void fpga_bridge_free(struct fpga_bridge *bridge)
|
||||||
{
|
{
|
||||||
|
@ -388,9 +391,56 @@ void fpga_bridge_free(struct fpga_bridge *bridge)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(fpga_bridge_free);
|
EXPORT_SYMBOL_GPL(fpga_bridge_free);
|
||||||
|
|
||||||
|
static void devm_fpga_bridge_release(struct device *dev, void *res)
|
||||||
|
{
|
||||||
|
struct fpga_bridge *bridge = *(struct fpga_bridge **)res;
|
||||||
|
|
||||||
|
fpga_bridge_free(bridge);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* fpga_bridge_register - register a fpga bridge
|
* devm_fpga_bridge_create - create and init a managed struct fpga_bridge
|
||||||
* @bridge: FPGA bridge struct created by fpga_bridge_create
|
* @dev: FPGA bridge device from pdev
|
||||||
|
* @name: FPGA bridge name
|
||||||
|
* @br_ops: pointer to structure of fpga bridge ops
|
||||||
|
* @priv: FPGA bridge private data
|
||||||
|
*
|
||||||
|
* This function is intended for use in a FPGA bridge driver's probe function.
|
||||||
|
* After the bridge driver creates the struct with devm_fpga_bridge_create(), it
|
||||||
|
* should register the bridge with fpga_bridge_register(). The bridge driver's
|
||||||
|
* remove function should call fpga_bridge_unregister(). The bridge struct
|
||||||
|
* allocated with this function will be freed automatically on driver detach.
|
||||||
|
* This includes the case of a probe function returning error before calling
|
||||||
|
* fpga_bridge_register(), the struct will still get cleaned up.
|
||||||
|
*
|
||||||
|
* Return: struct fpga_bridge or NULL
|
||||||
|
*/
|
||||||
|
struct fpga_bridge
|
||||||
|
*devm_fpga_bridge_create(struct device *dev, const char *name,
|
||||||
|
const struct fpga_bridge_ops *br_ops, void *priv)
|
||||||
|
{
|
||||||
|
struct fpga_bridge **ptr, *bridge;
|
||||||
|
|
||||||
|
ptr = devres_alloc(devm_fpga_bridge_release, sizeof(*ptr), GFP_KERNEL);
|
||||||
|
if (!ptr)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
bridge = fpga_bridge_create(dev, name, br_ops, priv);
|
||||||
|
if (!bridge) {
|
||||||
|
devres_free(ptr);
|
||||||
|
} else {
|
||||||
|
*ptr = bridge;
|
||||||
|
devres_add(dev, ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
return bridge;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(devm_fpga_bridge_create);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* fpga_bridge_register - register a FPGA bridge
|
||||||
|
*
|
||||||
|
* @bridge: FPGA bridge struct
|
||||||
*
|
*
|
||||||
* Return: 0 for success, error code otherwise.
|
* Return: 0 for success, error code otherwise.
|
||||||
*/
|
*/
|
||||||
|
@ -412,8 +462,11 @@ int fpga_bridge_register(struct fpga_bridge *bridge)
|
||||||
EXPORT_SYMBOL_GPL(fpga_bridge_register);
|
EXPORT_SYMBOL_GPL(fpga_bridge_register);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* fpga_bridge_unregister - unregister and free a fpga bridge
|
* fpga_bridge_unregister - unregister a FPGA bridge
|
||||||
* @bridge: FPGA bridge struct created by fpga_bridge_create
|
*
|
||||||
|
* @bridge: FPGA bridge struct
|
||||||
|
*
|
||||||
|
* This function is intended for use in a FPGA bridge driver's remove function.
|
||||||
*/
|
*/
|
||||||
void fpga_bridge_unregister(struct fpga_bridge *bridge)
|
void fpga_bridge_unregister(struct fpga_bridge *bridge)
|
||||||
{
|
{
|
||||||
|
@ -430,9 +483,6 @@ EXPORT_SYMBOL_GPL(fpga_bridge_unregister);
|
||||||
|
|
||||||
static void fpga_bridge_dev_release(struct device *dev)
|
static void fpga_bridge_dev_release(struct device *dev)
|
||||||
{
|
{
|
||||||
struct fpga_bridge *bridge = to_fpga_bridge(dev);
|
|
||||||
|
|
||||||
fpga_bridge_free(bridge);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init fpga_bridge_dev_init(void)
|
static int __init fpga_bridge_dev_init(void)
|
||||||
|
|
|
@ -121,8 +121,8 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
clk_disable(priv->clk);
|
clk_disable(priv->clk);
|
||||||
|
|
||||||
br = fpga_bridge_create(&pdev->dev, "Xilinx PR Decoupler",
|
br = devm_fpga_bridge_create(&pdev->dev, "Xilinx PR Decoupler",
|
||||||
&xlnx_pr_decoupler_br_ops, priv);
|
&xlnx_pr_decoupler_br_ops, priv);
|
||||||
if (!br) {
|
if (!br) {
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto err_clk;
|
goto err_clk;
|
||||||
|
|
|
@ -69,4 +69,8 @@ void fpga_bridge_free(struct fpga_bridge *br);
|
||||||
int fpga_bridge_register(struct fpga_bridge *br);
|
int fpga_bridge_register(struct fpga_bridge *br);
|
||||||
void fpga_bridge_unregister(struct fpga_bridge *br);
|
void fpga_bridge_unregister(struct fpga_bridge *br);
|
||||||
|
|
||||||
|
struct fpga_bridge
|
||||||
|
*devm_fpga_bridge_create(struct device *dev, const char *name,
|
||||||
|
const struct fpga_bridge_ops *br_ops, void *priv);
|
||||||
|
|
||||||
#endif /* _LINUX_FPGA_BRIDGE_H */
|
#endif /* _LINUX_FPGA_BRIDGE_H */
|
||||||
|
|
Loading…
Reference in a new issue