Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: ipa: pass a platform device to ipa_reg_init()

Browse Source 
Rather than using the platform device pointer field in the IPA
pointer, pass a platform device pointer to ipa_reg_init().  Use
that pointer throughout that function.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alex Elder 2024-03-01 11:02:38 -06:00 committed by David S. Miller
parent ad1be80d75
commit a47956e72a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ipa/ipa_main.c
View File

@ -866,7 +866,7 @@ static int ipa_probe(struct platform_device *pdev)
ipa->modem_route_count = data->modem_route_count; ipa->modem_route_count = data->modem_route_count;
init_completion(&ipa->completion); init_completion(&ipa->completion);
ret = ipa_reg_init(ipa); ret = ipa_reg_init(ipa, pdev);
if (ret) if (ret)
goto err_kfree_ipa; goto err_kfree_ipa;

8
drivers/net/ipa/ipa_reg.c
View File

@ -4,6 +4,7 @@
* Copyright (C) 2019-2023 Linaro Ltd. * Copyright (C) 2019-2023 Linaro Ltd.
*/ */
#include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include "ipa.h" #include "ipa.h"
@ -132,9 +133,9 @@ static const struct regs *ipa_regs(enum ipa_version version)
} }
} }
int ipa_reg_init(struct ipa *ipa) int ipa_reg_init(struct ipa *ipa, struct platform_device *pdev)
{ {
struct device *dev = &ipa->pdev->dev; struct device *dev = &pdev->dev;
const struct regs *regs; const struct regs *regs;
struct resource *res; struct resource *res;
@ -146,8 +147,7 @@ int ipa_reg_init(struct ipa *ipa)
return -EINVAL; return -EINVAL;
/* Setup IPA register memory */ /* Setup IPA register memory */
res = platform_get_resource_byname(ipa->pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ipa-reg");
"ipa-reg");
if (!res) { if (!res) {
dev_err(dev, "DT error getting \"ipa-reg\" memory property\n"); dev_err(dev, "DT error getting \"ipa-reg\" memory property\n");
return -ENODEV; return -ENODEV;

4
drivers/net/ipa/ipa_reg.h
View File

@ -12,6 +12,8 @@
#include "ipa_version.h" #include "ipa_version.h"
#include "reg.h" #include "reg.h"
struct platform_device;
struct ipa; struct ipa;
/** /**
@ -643,7 +645,7 @@ extern const struct regs ipa_regs_v5_5;
const struct reg *ipa_reg(struct ipa *ipa, enum ipa_reg_id reg_id); const struct reg *ipa_reg(struct ipa *ipa, enum ipa_reg_id reg_id);
int ipa_reg_init(struct ipa *ipa); int ipa_reg_init(struct ipa *ipa, struct platform_device *pdev);
void ipa_reg_exit(struct ipa *ipa); void ipa_reg_exit(struct ipa *ipa);
#endif /* _IPA_REG_H_ */ #endif /* _IPA_REG_H_ */