mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 18:19:02 +00:00
0989b7ad3a
Removed upstreamed: bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.102&id=f333c1916fd6b55900029bf8f918cc00009e2111 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us>
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From 915f1d230e5292bc2156a9997bcb19d9e632f10b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Wed, 16 Dec 2020 15:33:05 +0100
|
|
Subject: [PATCH] phy: phy-brcm-usb: specify init function format at struct
|
|
level
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This is slightly cleaner solution that assures noone assings a wrong
|
|
function to the pointer.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Link: https://lore.kernel.org/r/20201216143305.12179-2-zajec5@gmail.com
|
|
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
---
|
|
drivers/phy/broadcom/phy-brcm-usb.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/phy/broadcom/phy-brcm-usb.c
|
|
+++ b/drivers/phy/broadcom/phy-brcm-usb.c
|
|
@@ -36,7 +36,7 @@ struct value_to_name_map {
|
|
};
|
|
|
|
struct match_chip_info {
|
|
- void *init_func;
|
|
+ void (*init_func)(struct brcm_usb_init_params *params);
|
|
u8 required_regs[BRCM_REGS_MAX + 1];
|
|
u8 optional_reg;
|
|
};
|
|
@@ -458,7 +458,6 @@ static int brcm_usb_phy_probe(struct pla
|
|
struct device_node *dn = pdev->dev.of_node;
|
|
int err;
|
|
const char *mode;
|
|
- void (*dvr_init)(struct brcm_usb_init_params *params);
|
|
const struct match_chip_info *info;
|
|
struct regmap *rmap;
|
|
int x;
|
|
@@ -474,8 +473,8 @@ static int brcm_usb_phy_probe(struct pla
|
|
info = of_device_get_match_data(&pdev->dev);
|
|
if (!info)
|
|
return -ENOENT;
|
|
- dvr_init = info->init_func;
|
|
- (*dvr_init)(&priv->ini);
|
|
+
|
|
+ info->init_func(&priv->ini);
|
|
|
|
dev_dbg(dev, "Best mapping table is for %s\n",
|
|
priv->ini.family_name);
|