luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ethernet: emac: Fix phy mode type

Browse Source 
Pass a phy_interface_t to of_get_phy_mode(), by changing the type of
phy_mode in the device structure. This then requires that
zmii_attach() is also changes, since it takes a pointer to phy_mode.

Fixes: 0c65b2b90d ("net: of_get_phy_mode: Change API to solve int/unit warnings")
Reported-by: kbuild test robot <lkp@intel.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2019-11-05 18:53:23 +01:00 committed by David S. Miller
parent 5ea4b122e7
commit f921861776
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/ibm/emac/core.h
View File

@ -171,7 +171,7 @@ struct emac_instance {
struct mal_commac commac;
/* PHY infos */
int phy_mode;
phy_interface_t phy_mode;
u32 phy_map;
u32 phy_address;
u32 phy_feat_exc;

3
drivers/net/ethernet/ibm/emac/zmii.c
View File

@ -78,7 +78,8 @@ static inline u32 zmii_mode_mask(int mode, int input)
}
}
int zmii_attach(struct platform_device *ofdev, int input, int *mode)
int zmii_attach(struct platform_device *ofdev, int input,
phy_interface_t *mode)
{
struct zmii_instance *dev = platform_get_drvdata(ofdev);
struct zmii_regs __iomem *p = dev->base;

3
drivers/net/ethernet/ibm/emac/zmii.h
View File

@ -50,7 +50,8 @@ struct zmii_instance {
int zmii_init(void);
void zmii_exit(void);
int zmii_attach(struct platform_device *ofdev, int input, int *mode);
int zmii_attach(struct platform_device *ofdev, int input,
phy_interface_t *mode);
void zmii_detach(struct platform_device *ofdev, int input);
void zmii_get_mdio(struct platform_device *ofdev, int input);
void zmii_put_mdio(struct platform_device *ofdev, int input);