mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-22 02:20:40 +00:00
87202eae1d
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. Eventually after all drivers are converted, .remove_new() is renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230517230239.187727-9-u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
130 lines
3.2 KiB
C
130 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (C) 2014 Marvell Technology Group Ltd.
|
|
*
|
|
* Antoine Tenart <antoine.tenart@free-electrons.com>
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/phy/phy.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/usb/chipidea.h>
|
|
#include <linux/usb/hcd.h>
|
|
#include <linux/usb/ulpi.h>
|
|
|
|
#include "ci.h"
|
|
|
|
struct ci_hdrc_usb2_priv {
|
|
struct platform_device *ci_pdev;
|
|
struct clk *clk;
|
|
};
|
|
|
|
static const struct ci_hdrc_platform_data ci_default_pdata = {
|
|
.capoffset = DEF_CAPOFFSET,
|
|
.flags = CI_HDRC_DISABLE_STREAMING,
|
|
};
|
|
|
|
static const struct ci_hdrc_platform_data ci_zynq_pdata = {
|
|
.capoffset = DEF_CAPOFFSET,
|
|
.flags = CI_HDRC_PHY_VBUS_CONTROL,
|
|
};
|
|
|
|
static const struct ci_hdrc_platform_data ci_zevio_pdata = {
|
|
.capoffset = DEF_CAPOFFSET,
|
|
.flags = CI_HDRC_REGS_SHARED | CI_HDRC_FORCE_FULLSPEED,
|
|
};
|
|
|
|
static const struct of_device_id ci_hdrc_usb2_of_match[] = {
|
|
{ .compatible = "chipidea,usb2" },
|
|
{ .compatible = "xlnx,zynq-usb-2.20a", .data = &ci_zynq_pdata },
|
|
{ .compatible = "lsi,zevio-usb", .data = &ci_zevio_pdata },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, ci_hdrc_usb2_of_match);
|
|
|
|
static int ci_hdrc_usb2_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
struct ci_hdrc_usb2_priv *priv;
|
|
struct ci_hdrc_platform_data *ci_pdata = dev_get_platdata(dev);
|
|
int ret;
|
|
const struct of_device_id *match;
|
|
|
|
if (!ci_pdata) {
|
|
ci_pdata = devm_kmalloc(dev, sizeof(*ci_pdata), GFP_KERNEL);
|
|
if (!ci_pdata)
|
|
return -ENOMEM;
|
|
*ci_pdata = ci_default_pdata; /* struct copy */
|
|
}
|
|
|
|
match = of_match_device(ci_hdrc_usb2_of_match, &pdev->dev);
|
|
if (match && match->data) {
|
|
/* struct copy */
|
|
*ci_pdata = *(struct ci_hdrc_platform_data *)match->data;
|
|
}
|
|
|
|
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
priv->clk = devm_clk_get_optional(dev, NULL);
|
|
if (IS_ERR(priv->clk))
|
|
return PTR_ERR(priv->clk);
|
|
|
|
ret = clk_prepare_enable(priv->clk);
|
|
if (ret) {
|
|
dev_err(dev, "failed to enable the clock: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
ci_pdata->name = dev_name(dev);
|
|
|
|
priv->ci_pdev = ci_hdrc_add_device(dev, pdev->resource,
|
|
pdev->num_resources, ci_pdata);
|
|
if (IS_ERR(priv->ci_pdev)) {
|
|
ret = PTR_ERR(priv->ci_pdev);
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(dev,
|
|
"failed to register ci_hdrc platform device: %d\n",
|
|
ret);
|
|
goto clk_err;
|
|
}
|
|
|
|
platform_set_drvdata(pdev, priv);
|
|
|
|
pm_runtime_no_callbacks(dev);
|
|
pm_runtime_enable(dev);
|
|
|
|
return 0;
|
|
|
|
clk_err:
|
|
clk_disable_unprepare(priv->clk);
|
|
return ret;
|
|
}
|
|
|
|
static void ci_hdrc_usb2_remove(struct platform_device *pdev)
|
|
{
|
|
struct ci_hdrc_usb2_priv *priv = platform_get_drvdata(pdev);
|
|
|
|
pm_runtime_disable(&pdev->dev);
|
|
ci_hdrc_remove_device(priv->ci_pdev);
|
|
clk_disable_unprepare(priv->clk);
|
|
}
|
|
|
|
static struct platform_driver ci_hdrc_usb2_driver = {
|
|
.probe = ci_hdrc_usb2_probe,
|
|
.remove_new = ci_hdrc_usb2_remove,
|
|
.driver = {
|
|
.name = "chipidea-usb2",
|
|
.of_match_table = of_match_ptr(ci_hdrc_usb2_of_match),
|
|
},
|
|
};
|
|
module_platform_driver(ci_hdrc_usb2_driver);
|
|
|
|
MODULE_DESCRIPTION("ChipIdea HDRC USB2 binding for ci13xxx");
|
|
MODULE_AUTHOR("Antoine Tenart <antoine.tenart@free-electrons.com>");
|
|
MODULE_LICENSE("GPL");
|