* [PATCH] net: axienet: Remove unused parameter from __axienet_device_reset
@ 2016-10-13 11:28 Tobias Klauser
2016-10-13 12:23 ` Michal Simek
2016-10-13 16:15 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Tobias Klauser @ 2016-10-13 11:28 UTC (permalink / raw)
To: Anirudha Sarangi, John Linn; +Cc: Michal Simek, Sören Brinkmann, netdev
The dev parameter passed to __axienet_device_reset() is not used inside
the function, so remove it.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 35f9f9742a48..c688d68c39aa 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -431,8 +431,7 @@ static void axienet_setoptions(struct net_device *ndev, u32 options)
lp->options |= options;
}
-static void __axienet_device_reset(struct axienet_local *lp,
- struct device *dev, off_t offset)
+static void __axienet_device_reset(struct axienet_local *lp, off_t offset)
{
u32 timeout;
/* Reset Axi DMA. This would reset Axi Ethernet core as well. The reset
@@ -468,8 +467,8 @@ static void axienet_device_reset(struct net_device *ndev)
u32 axienet_status;
struct axienet_local *lp = netdev_priv(ndev);
- __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
- __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
+ __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
+ __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE;
lp->options |= XAE_OPTION_VLAN;
@@ -1338,8 +1337,8 @@ static void axienet_dma_err_handler(unsigned long data)
axienet_iow(lp, XAE_MDIO_MC_OFFSET, (mdio_mcreg &
~XAE_MDIO_MC_MDIOEN_MASK));
- __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
- __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
+ __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
+ __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
axienet_iow(lp, XAE_MDIO_MC_OFFSET, mdio_mcreg);
axienet_mdio_wait_until_ready(lp);
--
2.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] net: axienet: Remove unused parameter from __axienet_device_reset
2016-10-13 11:28 [PATCH] net: axienet: Remove unused parameter from __axienet_device_reset Tobias Klauser
@ 2016-10-13 12:23 ` Michal Simek
2016-10-13 14:40 ` Tobias Klauser
2016-10-13 16:15 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: Michal Simek @ 2016-10-13 12:23 UTC (permalink / raw)
To: Tobias Klauser, Anirudha Sarangi, John Linn
Cc: Michal Simek, Sören Brinkmann, netdev
On 13.10.2016 13:28, Tobias Klauser wrote:
> The dev parameter passed to __axienet_device_reset() is not used inside
> the function, so remove it.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> ---
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 35f9f9742a48..c688d68c39aa 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -431,8 +431,7 @@ static void axienet_setoptions(struct net_device *ndev, u32 options)
> lp->options |= options;
> }
>
> -static void __axienet_device_reset(struct axienet_local *lp,
> - struct device *dev, off_t offset)
> +static void __axienet_device_reset(struct axienet_local *lp, off_t offset)
> {
> u32 timeout;
> /* Reset Axi DMA. This would reset Axi Ethernet core as well. The reset
> @@ -468,8 +467,8 @@ static void axienet_device_reset(struct net_device *ndev)
> u32 axienet_status;
> struct axienet_local *lp = netdev_priv(ndev);
>
> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
> + __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
> + __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
>
> lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE;
> lp->options |= XAE_OPTION_VLAN;
> @@ -1338,8 +1337,8 @@ static void axienet_dma_err_handler(unsigned long data)
> axienet_iow(lp, XAE_MDIO_MC_OFFSET, (mdio_mcreg &
> ~XAE_MDIO_MC_MDIOEN_MASK));
>
> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
> + __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
> + __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
>
> axienet_iow(lp, XAE_MDIO_MC_OFFSET, mdio_mcreg);
> axienet_mdio_wait_until_ready(lp);
>
Can you please send this directly to mainline?
And put my:
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Thanks,
Michal
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] net: axienet: Remove unused parameter from __axienet_device_reset
2016-10-13 12:23 ` Michal Simek
@ 2016-10-13 14:40 ` Tobias Klauser
2016-10-13 15:02 ` Michal Simek
0 siblings, 1 reply; 5+ messages in thread
From: Tobias Klauser @ 2016-10-13 14:40 UTC (permalink / raw)
To: Michal Simek; +Cc: Anirudha Sarangi, John Linn, Sören Brinkmann, netdev
On 2016-10-13 at 14:23:49 +0200, Michal Simek <michal.simek@xilinx.com> wrote:
> On 13.10.2016 13:28, Tobias Klauser wrote:
> > The dev parameter passed to __axienet_device_reset() is not used inside
> > the function, so remove it.
> >
> > Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> > ---
> > drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 +++++------
> > 1 file changed, 5 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> > index 35f9f9742a48..c688d68c39aa 100644
> > --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> > +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> > @@ -431,8 +431,7 @@ static void axienet_setoptions(struct net_device *ndev, u32 options)
> > lp->options |= options;
> > }
> >
> > -static void __axienet_device_reset(struct axienet_local *lp,
> > - struct device *dev, off_t offset)
> > +static void __axienet_device_reset(struct axienet_local *lp, off_t offset)
> > {
> > u32 timeout;
> > /* Reset Axi DMA. This would reset Axi Ethernet core as well. The reset
> > @@ -468,8 +467,8 @@ static void axienet_device_reset(struct net_device *ndev)
> > u32 axienet_status;
> > struct axienet_local *lp = netdev_priv(ndev);
> >
> > - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
> > - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
> > + __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
> > + __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
> >
> > lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE;
> > lp->options |= XAE_OPTION_VLAN;
> > @@ -1338,8 +1337,8 @@ static void axienet_dma_err_handler(unsigned long data)
> > axienet_iow(lp, XAE_MDIO_MC_OFFSET, (mdio_mcreg &
> > ~XAE_MDIO_MC_MDIOEN_MASK));
> >
> > - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
> > - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
> > + __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
> > + __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
> >
> > axienet_iow(lp, XAE_MDIO_MC_OFFSET, mdio_mcreg);
> > axienet_mdio_wait_until_ready(lp);
> >
>
> Can you please send this directly to mainline?
> And put my:
> Reviewed-by: Michal Simek <michal.simek@xilinx.com>
The netdev mailing list was Cc'ed on the patch, so it should end up in
davem's patch queue.
Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] net: axienet: Remove unused parameter from __axienet_device_reset
2016-10-13 14:40 ` Tobias Klauser
@ 2016-10-13 15:02 ` Michal Simek
0 siblings, 0 replies; 5+ messages in thread
From: Michal Simek @ 2016-10-13 15:02 UTC (permalink / raw)
To: Tobias Klauser, Michal Simek
Cc: Anirudha Sarangi, John Linn, Sören Brinkmann, netdev
On 13.10.2016 16:40, Tobias Klauser wrote:
> On 2016-10-13 at 14:23:49 +0200, Michal Simek <michal.simek@xilinx.com> wrote:
>> On 13.10.2016 13:28, Tobias Klauser wrote:
>>> The dev parameter passed to __axienet_device_reset() is not used inside
>>> the function, so remove it.
>>>
>>> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
>>> ---
>>> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 +++++------
>>> 1 file changed, 5 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>>> index 35f9f9742a48..c688d68c39aa 100644
>>> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>>> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>>> @@ -431,8 +431,7 @@ static void axienet_setoptions(struct net_device *ndev, u32 options)
>>> lp->options |= options;
>>> }
>>>
>>> -static void __axienet_device_reset(struct axienet_local *lp,
>>> - struct device *dev, off_t offset)
>>> +static void __axienet_device_reset(struct axienet_local *lp, off_t offset)
>>> {
>>> u32 timeout;
>>> /* Reset Axi DMA. This would reset Axi Ethernet core as well. The reset
>>> @@ -468,8 +467,8 @@ static void axienet_device_reset(struct net_device *ndev)
>>> u32 axienet_status;
>>> struct axienet_local *lp = netdev_priv(ndev);
>>>
>>> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
>>> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
>>> + __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
>>> + __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
>>>
>>> lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE;
>>> lp->options |= XAE_OPTION_VLAN;
>>> @@ -1338,8 +1337,8 @@ static void axienet_dma_err_handler(unsigned long data)
>>> axienet_iow(lp, XAE_MDIO_MC_OFFSET, (mdio_mcreg &
>>> ~XAE_MDIO_MC_MDIOEN_MASK));
>>>
>>> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
>>> - __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
>>> + __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
>>> + __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
>>>
>>> axienet_iow(lp, XAE_MDIO_MC_OFFSET, mdio_mcreg);
>>> axienet_mdio_wait_until_ready(lp);
>>>
>>
>> Can you please send this directly to mainline?
>> And put my:
>> Reviewed-by: Michal Simek <michal.simek@xilinx.com>
>
> The netdev mailing list was Cc'ed on the patch, so it should end up in
> davem's patch queue.
ah ok. I missed that.
Then we are good.
Thanks,
Michal
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: axienet: Remove unused parameter from __axienet_device_reset
2016-10-13 11:28 [PATCH] net: axienet: Remove unused parameter from __axienet_device_reset Tobias Klauser
2016-10-13 12:23 ` Michal Simek
@ 2016-10-13 16:15 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2016-10-13 16:15 UTC (permalink / raw)
To: tklauser; +Cc: anirudh, John.Linn, michal.simek, soren.brinkmann, netdev
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 13 Oct 2016 13:28:33 +0200
> The dev parameter passed to __axienet_device_reset() is not used inside
> the function, so remove it.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-13 16:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-13 11:28 [PATCH] net: axienet: Remove unused parameter from __axienet_device_reset Tobias Klauser
2016-10-13 12:23 ` Michal Simek
2016-10-13 14:40 ` Tobias Klauser
2016-10-13 15:02 ` Michal Simek
2016-10-13 16:15 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).