mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	
		
			
				
	
	
		
			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
 | 
						|
@@ -35,7 +35,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;
 | 
						|
 };
 | 
						|
@@ -428,7 +428,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;
 | 
						|
@@ -444,8 +443,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);
 |