| Message ID | 20191016082205.26899-1-ben.dooks@codethink.co.uk (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c9ad4c1049f7e0e8d59e975963dda002af47d93e |
| Headers | show |
| Series | net: stmmac: fix argument to stmmac_pcs_ctrl_ane() | expand |
On 16/10/2019 09:22, Ben Dooks (Codethink) wrote: > The stmmac_pcs_ctrl_ane() expects a register address as > argument 1, but for some reason the mac_device_info is > being passed. > > Fix the warning (and possible bug) from sparse: > > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: warning: incorrect type in argument 1 (different address spaces) > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: expected void [noderef] <asn:2> *ioaddr > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: got struct mac_device_info *hw apologies, looks like I reposted this by accident.
From: "Ben Dooks (Codethink)" <ben.dooks@codethink.co.uk> Date: Wed, 16 Oct 2019 09:22:05 +0100 > The stmmac_pcs_ctrl_ane() expects a register address as > argument 1, but for some reason the mac_device_info is > being passed. > > Fix the warning (and possible bug) from sparse: > > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: warning: incorrect type in argument 1 (different address spaces) > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: expected void [noderef] <asn:2> *ioaddr > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: got struct mac_device_info *hw > > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> I'm still reviewing this but FYI you did not have to send this twice. Always check: https://patchwork.ozlabs.org/project/netdev/list/ to see what state your patch submission is in.
On 16/10/2019 21:28, David Miller wrote: > From: "Ben Dooks (Codethink)" <ben.dooks@codethink.co.uk> > Date: Wed, 16 Oct 2019 09:22:05 +0100 > >> The stmmac_pcs_ctrl_ane() expects a register address as >> argument 1, but for some reason the mac_device_info is >> being passed. >> >> Fix the warning (and possible bug) from sparse: >> >> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: warning: incorrect type in argument 1 (different address spaces) >> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: expected void [noderef] <asn:2> *ioaddr >> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: got struct mac_device_info *hw >> >> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> > > I'm still reviewing this but FYI you did not have to send this > twice. Yes, I accidentally sent the wrong patch out (already apologised on the re-send as I noticed it about 10 minutes after sending).
From: "Ben Dooks (Codethink)" <ben.dooks@codethink.co.uk> Date: Wed, 16 Oct 2019 09:22:05 +0100 > The stmmac_pcs_ctrl_ane() expects a register address as > argument 1, but for some reason the mac_device_info is > being passed. > > Fix the warning (and possible bug) from sparse: > > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: warning: incorrect type in argument 1 (different address spaces) > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: expected void [noderef] <asn:2> *ioaddr > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: got struct mac_device_info *hw > > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Applied, thanks.
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index c76a1336a451..3947c95121c6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2610,7 +2610,7 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) } if (priv->hw->pcs) - stmmac_pcs_ctrl_ane(priv, priv->hw, 1, priv->hw->ps, 0); + stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 1, priv->hw->ps, 0); /* set TX and RX rings length */ stmmac_set_rings_length(priv);
The stmmac_pcs_ctrl_ane() expects a register address as argument 1, but for some reason the mac_device_info is being passed. Fix the warning (and possible bug) from sparse: drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: warning: incorrect type in argument 1 (different address spaces) drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: expected void [noderef] <asn:2> *ioaddr drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2613:17: got struct mac_device_info *hw Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com> Cc: Alexandre Torgue <alexandre.torgue@st.com> Cc: Jose Abreu <joabreu@synopsys.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: netdev@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)