Re: [PATCH] net: sun4i-emac: remove erroneous assignment

2013-06-04 Thread David Miller
From: Maxime Ripard 
Date: Tue, 4 Jun 2013 15:40:34 +0200

> On Mon, Jun 03, 2013 at 11:36:50PM +0200, Arnd Bergmann wrote:
>> The newly added sun4i-emac driver causes a build error when
>> CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
>> assign a pointer to netdev->poll_controller, which has
>> been replaced with ops->ndo_poll_controller in 2.6.31!
>> 
>> The correct assignment is present as well, so we just need
>> to remove the wrong one.
> 
> Thanks for fixing this,
> Acked-by: Maxime Ripard 

Applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] net: sun4i-emac: remove erroneous assignment

2013-06-04 Thread Maxime Ripard
Hi Arnd,

On Mon, Jun 03, 2013 at 11:36:50PM +0200, Arnd Bergmann wrote:
> The newly added sun4i-emac driver causes a build error when
> CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
> assign a pointer to netdev->poll_controller, which has
> been replaced with ops->ndo_poll_controller in 2.6.31!
> 
> The correct assignment is present as well, so we just need
> to remove the wrong one.

Thanks for fixing this,
Acked-by: Maxime Ripard 

Maxime
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] net: sun4i-emac: remove erroneous assignment

2013-06-04 Thread Maxime Ripard
Hi Arnd,

On Mon, Jun 03, 2013 at 11:36:50PM +0200, Arnd Bergmann wrote:
 The newly added sun4i-emac driver causes a build error when
 CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
 assign a pointer to netdev-poll_controller, which has
 been replaced with ops-ndo_poll_controller in 2.6.31!
 
 The correct assignment is present as well, so we just need
 to remove the wrong one.

Thanks for fixing this,
Acked-by: Maxime Ripard maxime.rip...@anandra.org

Maxime
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] net: sun4i-emac: remove erroneous assignment

2013-06-04 Thread David Miller
From: Maxime Ripard maxime.rip...@free-electrons.com
Date: Tue, 4 Jun 2013 15:40:34 +0200

 On Mon, Jun 03, 2013 at 11:36:50PM +0200, Arnd Bergmann wrote:
 The newly added sun4i-emac driver causes a build error when
 CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
 assign a pointer to netdev-poll_controller, which has
 been replaced with ops-ndo_poll_controller in 2.6.31!
 
 The correct assignment is present as well, so we just need
 to remove the wrong one.
 
 Thanks for fixing this,
 Acked-by: Maxime Ripard maxime.rip...@anandra.org

Applied.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] net: sun4i-emac: remove erroneous assignment

2013-06-03 Thread Stefan Roese
On 06/03/2013 11:36 PM, Arnd Bergmann wrote:
> The newly added sun4i-emac driver causes a build error when
> CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
> assign a pointer to netdev->poll_controller, which has
> been replaced with ops->ndo_poll_controller in 2.6.31!
> 
> The correct assignment is present as well, so we just need
> to remove the wrong one.
> 
> Signed-off-by: Arnd Bergmann 
> Cc: Stefan Roese 
> Cc: Maxime Ripard 
> Cc: Richard Genoud 

Thanks for fixing this:

Acked-by: Stefan Roese 

Thanks,
Stefan

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] net: sun4i-emac: remove erroneous assignment

2013-06-03 Thread Arnd Bergmann
The newly added sun4i-emac driver causes a build error when
CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
assign a pointer to netdev->poll_controller, which has
been replaced with ops->ndo_poll_controller in 2.6.31!

The correct assignment is present as well, so we just need
to remove the wrong one.

Signed-off-by: Arnd Bergmann 
Cc: Stefan Roese 
Cc: Maxime Ripard 
Cc: Richard Genoud 
---
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c 
b/drivers/net/ethernet/allwinner/sun4i-emac.c
index b411344..3e7b220 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -869,10 +869,6 @@ static int emac_probe(struct platform_device *pdev)
ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
ndev->ethtool_ops = _ethtool_ops;
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-   ndev->poll_controller = _poll_controller;
-#endif
-
platform_set_drvdata(pdev, ndev);
 
/* Carrier starts down, phylib will bring it up */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] net: sun4i-emac: remove erroneous assignment

2013-06-03 Thread Stefan Roese
On 06/03/2013 11:36 PM, Arnd Bergmann wrote:
 The newly added sun4i-emac driver causes a build error when
 CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
 assign a pointer to netdev-poll_controller, which has
 been replaced with ops-ndo_poll_controller in 2.6.31!
 
 The correct assignment is present as well, so we just need
 to remove the wrong one.
 
 Signed-off-by: Arnd Bergmann a...@arndb.de
 Cc: Stefan Roese s...@denx.de
 Cc: Maxime Ripard maxime.rip...@free-electrons.com
 Cc: Richard Genoud richard.gen...@gmail.com

Thanks for fixing this:

Acked-by: Stefan Roese s...@denx.de

Thanks,
Stefan

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] net: sun4i-emac: remove erroneous assignment

2013-06-03 Thread Arnd Bergmann
The newly added sun4i-emac driver causes a build error when
CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
assign a pointer to netdev-poll_controller, which has
been replaced with ops-ndo_poll_controller in 2.6.31!

The correct assignment is present as well, so we just need
to remove the wrong one.

Signed-off-by: Arnd Bergmann a...@arndb.de
Cc: Stefan Roese s...@denx.de
Cc: Maxime Ripard maxime.rip...@free-electrons.com
Cc: Richard Genoud richard.gen...@gmail.com
---
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c 
b/drivers/net/ethernet/allwinner/sun4i-emac.c
index b411344..3e7b220 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -869,10 +869,6 @@ static int emac_probe(struct platform_device *pdev)
ndev-watchdog_timeo = msecs_to_jiffies(watchdog);
ndev-ethtool_ops = emac_ethtool_ops;
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-   ndev-poll_controller = emac_poll_controller;
-#endif
-
platform_set_drvdata(pdev, ndev);
 
/* Carrier starts down, phylib will bring it up */

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/