mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
reset: hisilicon: change the definition of hisi_reset_init
Change the input arguments type to struct platform_device pointer. Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
parent
b228fad50c
commit
97b7129cd2
3 changed files with 13 additions and 13 deletions
|
@ -86,7 +86,7 @@ static int hi3519_clk_probe(struct platform_device *pdev)
|
|||
struct hisi_clock_data *clk_data;
|
||||
struct hisi_reset_controller *rstc;
|
||||
|
||||
rstc = hisi_reset_init(np);
|
||||
rstc = hisi_reset_init(pdev);
|
||||
if (!rstc)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include <linux/io.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/reset-controller.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/spinlock.h>
|
||||
|
@ -98,25 +99,25 @@ static const struct reset_control_ops hisi_reset_ops = {
|
|||
.deassert = hisi_reset_deassert,
|
||||
};
|
||||
|
||||
struct hisi_reset_controller *hisi_reset_init(struct device_node *np)
|
||||
struct hisi_reset_controller *hisi_reset_init(struct platform_device *pdev)
|
||||
{
|
||||
struct hisi_reset_controller *rstc;
|
||||
struct resource *res;
|
||||
|
||||
rstc = kzalloc(sizeof(*rstc), GFP_KERNEL);
|
||||
rstc = devm_kmalloc(&pdev->dev, sizeof(*rstc), GFP_KERNEL);
|
||||
if (!rstc)
|
||||
return NULL;
|
||||
|
||||
rstc->membase = of_iomap(np, 0);
|
||||
if (!rstc->membase) {
|
||||
kfree(rstc);
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
rstc->membase = devm_ioremap(&pdev->dev,
|
||||
res->start, resource_size(res));
|
||||
if (!rstc->membase)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
spin_lock_init(&rstc->lock);
|
||||
|
||||
rstc->rcdev.owner = THIS_MODULE;
|
||||
rstc->rcdev.ops = &hisi_reset_ops;
|
||||
rstc->rcdev.of_node = np;
|
||||
rstc->rcdev.of_node = pdev->dev.of_node;
|
||||
rstc->rcdev.of_reset_n_cells = 2;
|
||||
rstc->rcdev.of_xlate = hisi_reset_of_xlate;
|
||||
reset_controller_register(&rstc->rcdev);
|
||||
|
@ -128,7 +129,5 @@ EXPORT_SYMBOL_GPL(hisi_reset_init);
|
|||
void hisi_reset_exit(struct hisi_reset_controller *rstc)
|
||||
{
|
||||
reset_controller_unregister(&rstc->rcdev);
|
||||
iounmap(rstc->membase);
|
||||
kfree(rstc);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(hisi_reset_exit);
|
||||
|
|
|
@ -22,10 +22,11 @@ struct device_node;
|
|||
struct hisi_reset_controller;
|
||||
|
||||
#ifdef CONFIG_RESET_CONTROLLER
|
||||
struct hisi_reset_controller *hisi_reset_init(struct device_node *np);
|
||||
struct hisi_reset_controller *hisi_reset_init(struct platform_device *pdev);
|
||||
void hisi_reset_exit(struct hisi_reset_controller *rstc);
|
||||
#else
|
||||
static inline hisi_reset_controller *hisi_reset_init(struct device_node *np)
|
||||
static inline
|
||||
struct hisi_reset_controller *hisi_reset_init(struct platform_device *pdev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue