* [PATCH 2.6.19] AT91RM9200 Ethernet update 1
@ 2006-12-04 12:26 Andrew Victor
2006-12-04 18:00 ` Stephen Hemminger
2006-12-04 23:41 ` Jeff Garzik
0 siblings, 2 replies; 3+ messages in thread
From: Andrew Victor @ 2006-12-04 12:26 UTC (permalink / raw)
To: netdev; +Cc: jgarzik
This patch is an update to the Atmel AT91RM9200 Ethernet driver.
1. Remove the global 'at91_dev' variable.
2. Move the global 'check_timer' variable into the private data
structure.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
diff -urN linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c linux-2.6.19-final/drivers/net/arm/at91_ether.c
--- linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c Sat Dec 2 17:28:27 2006
+++ linux-2.6.19-final/drivers/net/arm/at91_ether.c Mon Dec 4 14:13:01 2006
@@ -41,9 +41,6 @@
#define DRV_NAME "at91_ether"
#define DRV_VERSION "1.0"
-static struct net_device *at91_dev;
-
-static struct timer_list check_timer;
#define LINK_POLL_INTERVAL (HZ)
/* ..................................................................... */
@@ -252,8 +249,8 @@
* PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),
* or board does not have it connected.
*/
- check_timer.expires = jiffies + LINK_POLL_INTERVAL;
- add_timer(&check_timer);
+ lp->check_timer.expires = jiffies + LINK_POLL_INTERVAL;
+ add_timer(&lp->check_timer);
return;
}
@@ -300,7 +297,7 @@
irq_number = lp->board_data.phy_irq_pin;
if (!irq_number) {
- del_timer_sync(&check_timer);
+ del_timer_sync(&lp->check_timer);
return;
}
@@ -362,13 +359,14 @@
static void at91ether_check_link(unsigned long dev_id)
{
struct net_device *dev = (struct net_device *) dev_id;
+ struct at91_private *lp = (struct at91_private *) dev->priv;
enable_mdi();
update_linkspeed(dev, 1);
disable_mdi();
- check_timer.expires = jiffies + LINK_POLL_INTERVAL;
- add_timer(&check_timer);
+ lp->check_timer.expires = jiffies + LINK_POLL_INTERVAL;
+ add_timer(&lp->check_timer);
}
/* ......................... ADDRESS MANAGEMENT ........................ */
@@ -939,9 +937,6 @@
unsigned int val;
int res;
- if (at91_dev) /* already initialized */
- return 0;
-
dev = alloc_etherdev(sizeof(struct at91_private));
if (!dev)
return -ENOMEM;
@@ -1024,7 +1019,6 @@
dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
return res;
}
- at91_dev = dev;
/* Determine current link speed */
spin_lock_irq(&lp->lock);
@@ -1036,9 +1030,9 @@
/* If board has no PHY IRQ, use a timer to poll the PHY */
if (!lp->board_data.phy_irq_pin) {
- init_timer(&check_timer);
- check_timer.data = (unsigned long)dev;
- check_timer.function = at91ether_check_link;
+ init_timer(&lp->check_timer);
+ lp->check_timer.data = (unsigned long)dev;
+ lp->check_timer.function = at91ether_check_link;
}
/* Display ethernet banner */
@@ -1115,15 +1109,16 @@
static int __devexit at91ether_remove(struct platform_device *pdev)
{
- struct at91_private *lp = (struct at91_private *) at91_dev->priv;
+ struct net_device *dev = platform_get_drvdata(pdev);
+ struct at91_private *lp = (struct at91_private *) dev->priv;
- unregister_netdev(at91_dev);
- free_irq(at91_dev->irq, at91_dev);
+ unregister_netdev(dev);
+ free_irq(dev->irq, dev);
dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
clk_put(lp->ether_clk);
- free_netdev(at91_dev);
- at91_dev = NULL;
+ platform_set_drvdata(pdev, NULL);
+ free_netdev(dev);
return 0;
}
@@ -1131,8 +1126,8 @@
static int at91ether_suspend(struct platform_device *pdev, pm_message_t mesg)
{
- struct at91_private *lp = (struct at91_private *) at91_dev->priv;
struct net_device *net_dev = platform_get_drvdata(pdev);
+ struct at91_private *lp = (struct at91_private *) net_dev->priv;
int phy_irq = lp->board_data.phy_irq_pin;
if (netif_running(net_dev)) {
@@ -1149,8 +1144,8 @@
static int at91ether_resume(struct platform_device *pdev)
{
- struct at91_private *lp = (struct at91_private *) at91_dev->priv;
struct net_device *net_dev = platform_get_drvdata(pdev);
+ struct at91_private *lp = (struct at91_private *) net_dev->priv;
int phy_irq = lp->board_data.phy_irq_pin;
if (netif_running(net_dev)) {
diff -urN linux-2.6.19-final.orig/drivers/net/arm/at91_ether.h linux-2.6.19-final/drivers/net/arm/at91_ether.h
--- linux-2.6.19-final.orig/drivers/net/arm/at91_ether.h Sat Dec 2 17:26:41 2006
+++ linux-2.6.19-final/drivers/net/arm/at91_ether.h Mon Dec 4 14:12:30 2006
@@ -87,6 +87,7 @@
spinlock_t lock; /* lock for MDI interface */
short phy_media; /* media interface type */
unsigned short phy_address; /* 5-bit MDI address of PHY (0..31) */
+ struct timer_list check_timer; /* Poll link status */
/* Transmit */
struct sk_buff *skb; /* holds skb until xmit interrupt completes */
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 2.6.19] AT91RM9200 Ethernet update 1
2006-12-04 12:26 [PATCH 2.6.19] AT91RM9200 Ethernet update 1 Andrew Victor
@ 2006-12-04 18:00 ` Stephen Hemminger
2006-12-04 23:41 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2006-12-04 18:00 UTC (permalink / raw)
To: Andrew Victor; +Cc: netdev, jgarzik
On 04 Dec 2006 14:26:57 +0200
Andrew Victor <andrew@sanpeople.com> wrote:
> This patch is an update to the Atmel AT91RM9200 Ethernet driver.
>
> 1. Remove the global 'at91_dev' variable.
> 2. Move the global 'check_timer' variable into the private data
> structure.
>
>
> Signed-off-by: Andrew Victor <andrew@sanpeople.com>
>
>
> diff -urN linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c linux-2.6.19-final/drivers/net/arm/at91_ether.c
> --- linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c Sat Dec 2 17:28:27 2006
> +++ linux-2.6.19-final/drivers/net/arm/at91_ether.c Mon Dec 4 14:13:01 2006
> @@ -41,9 +41,6 @@
> #define DRV_NAME "at91_ether"
> #define DRV_VERSION "1.0"
>
> -static struct net_device *at91_dev;
> -
> -static struct timer_list check_timer;
> #define LINK_POLL_INTERVAL (HZ)
>
> /* ..................................................................... */
> @@ -252,8 +249,8 @@
> * PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),
> * or board does not have it connected.
> */
> - check_timer.expires = jiffies + LINK_POLL_INTERVAL;
> - add_timer(&check_timer);
> + lp->check_timer.expires = jiffies + LINK_POLL_INTERVAL;
> + add_timer(&lp->check_timer);
> return;
> }
>
> @@ -300,7 +297,7 @@
>
> irq_number = lp->board_data.phy_irq_pin;
> if (!irq_number) {
> - del_timer_sync(&check_timer);
> + del_timer_sync(&lp->check_timer);
> return;
> }
>
> @@ -362,13 +359,14 @@
> static void at91ether_check_link(unsigned long dev_id)
> {
> struct net_device *dev = (struct net_device *) dev_id;
> + struct at91_private *lp = (struct at91_private *) dev->priv;
No cast needed.
Use netdev_priv(dev) rather than dev->priv. netdev_priv() is a constant
offset so the compiler can save a register.
--
Stephen Hemminger <shemminger@osdl.org>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 2.6.19] AT91RM9200 Ethernet update 1
2006-12-04 12:26 [PATCH 2.6.19] AT91RM9200 Ethernet update 1 Andrew Victor
2006-12-04 18:00 ` Stephen Hemminger
@ 2006-12-04 23:41 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2006-12-04 23:41 UTC (permalink / raw)
To: Andrew Victor; +Cc: netdev
NAK. see inline comments in quoted text.
Andrew Victor wrote:
Please fix your email's subject line per
http://linux.yyz.us/patch-format.html The subject is a one-line summary
that tells us not only what driver is being update, but also summarizes
the changes in the patch. "update 1" tells us nothing.
Your email subject line is the one-summary of this change that will be
copied directly into the kernel source code repository, archived for all
eternity.
> This patch is an update to the Atmel AT91RM9200 Ethernet driver.
Remove this line. Your email's body is copied directly into the kernel
changelog, and it's redundant. From your subject line, we already know
what this is updating.
> 1. Remove the global 'at91_dev' variable.
> 2. Move the global 'check_timer' variable into the private data
> structure.
>
>
> Signed-off-by: Andrew Victor <andrew@sanpeople.com>
>
>
> diff -urN linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c linux-2.6.19-final/drivers/net/arm/at91_ether.c
> --- linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c Sat Dec 2 17:28:27 2006
> +++ linux-2.6.19-final/drivers/net/arm/at91_ether.c Mon Dec 4 14:13:01 2006
> @@ -41,9 +41,6 @@
> #define DRV_NAME "at91_ether"
> #define DRV_VERSION "1.0"
>
> -static struct net_device *at91_dev;
> -
> -static struct timer_list check_timer;
> #define LINK_POLL_INTERVAL (HZ)
>
> /* ..................................................................... */
> @@ -252,8 +249,8 @@
> * PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),
> * or board does not have it connected.
> */
> - check_timer.expires = jiffies + LINK_POLL_INTERVAL;
> - add_timer(&check_timer);
> + lp->check_timer.expires = jiffies + LINK_POLL_INTERVAL;
> + add_timer(&lp->check_timer);
consider using mod_timer()
> return;
> }
>
> @@ -300,7 +297,7 @@
>
> irq_number = lp->board_data.phy_irq_pin;
> if (!irq_number) {
> - del_timer_sync(&check_timer);
> + del_timer_sync(&lp->check_timer);
> return;
> }
>
> @@ -362,13 +359,14 @@
> static void at91ether_check_link(unsigned long dev_id)
> {
> struct net_device *dev = (struct net_device *) dev_id;
> + struct at91_private *lp = (struct at91_private *) dev->priv;
>
> enable_mdi();
> update_linkspeed(dev, 1);
> disable_mdi();
>
> - check_timer.expires = jiffies + LINK_POLL_INTERVAL;
> - add_timer(&check_timer);
> + lp->check_timer.expires = jiffies + LINK_POLL_INTERVAL;
> + add_timer(&lp->check_timer);
ditto
> }
>
> /* ......................... ADDRESS MANAGEMENT ........................ */
> @@ -939,9 +937,6 @@
> unsigned int val;
> int res;
>
> - if (at91_dev) /* already initialized */
> - return 0;
> -
> dev = alloc_etherdev(sizeof(struct at91_private));
> if (!dev)
> return -ENOMEM;
> @@ -1024,7 +1019,6 @@
> dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
> return res;
> }
> - at91_dev = dev;
>
> /* Determine current link speed */
> spin_lock_irq(&lp->lock);
> @@ -1036,9 +1030,9 @@
>
> /* If board has no PHY IRQ, use a timer to poll the PHY */
> if (!lp->board_data.phy_irq_pin) {
> - init_timer(&check_timer);
> - check_timer.data = (unsigned long)dev;
> - check_timer.function = at91ether_check_link;
> + init_timer(&lp->check_timer);
> + lp->check_timer.data = (unsigned long)dev;
> + lp->check_timer.function = at91ether_check_link;
> }
>
> /* Display ethernet banner */
> @@ -1115,15 +1109,16 @@
>
> static int __devexit at91ether_remove(struct platform_device *pdev)
> {
> - struct at91_private *lp = (struct at91_private *) at91_dev->priv;
> + struct net_device *dev = platform_get_drvdata(pdev);
> + struct at91_private *lp = (struct at91_private *) dev->priv;
use netdev_priv()
> - unregister_netdev(at91_dev);
> - free_irq(at91_dev->irq, at91_dev);
> + unregister_netdev(dev);
> + free_irq(dev->irq, dev);
> dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
> clk_put(lp->ether_clk);
>
> - free_netdev(at91_dev);
> - at91_dev = NULL;
> + platform_set_drvdata(pdev, NULL);
> + free_netdev(dev);
> return 0;
> }
>
> @@ -1131,8 +1126,8 @@
>
> static int at91ether_suspend(struct platform_device *pdev, pm_message_t mesg)
> {
> - struct at91_private *lp = (struct at91_private *) at91_dev->priv;
> struct net_device *net_dev = platform_get_drvdata(pdev);
> + struct at91_private *lp = (struct at91_private *) net_dev->priv;
ditto
> int phy_irq = lp->board_data.phy_irq_pin;
>
> if (netif_running(net_dev)) {
> @@ -1149,8 +1144,8 @@
>
> static int at91ether_resume(struct platform_device *pdev)
> {
> - struct at91_private *lp = (struct at91_private *) at91_dev->priv;
> struct net_device *net_dev = platform_get_drvdata(pdev);
> + struct at91_private *lp = (struct at91_private *) net_dev->priv;
ditto
> int phy_irq = lp->board_data.phy_irq_pin;
>
> if (netif_running(net_dev)) {
> diff -urN linux-2.6.19-final.orig/drivers/net/arm/at91_ether.h linux-2.6.19-final/drivers/net/arm/at91_ether.h
> --- linux-2.6.19-final.orig/drivers/net/arm/at91_ether.h Sat Dec 2 17:26:41 2006
> +++ linux-2.6.19-final/drivers/net/arm/at91_ether.h Mon Dec 4 14:12:30 2006
> @@ -87,6 +87,7 @@
> spinlock_t lock; /* lock for MDI interface */
> short phy_media; /* media interface type */
> unsigned short phy_address; /* 5-bit MDI address of PHY (0..31) */
> + struct timer_list check_timer; /* Poll link status */
>
> /* Transmit */
> struct sk_buff *skb; /* holds skb until xmit interrupt completes */
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-12-04 23:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-04 12:26 [PATCH 2.6.19] AT91RM9200 Ethernet update 1 Andrew Victor
2006-12-04 18:00 ` Stephen Hemminger
2006-12-04 23:41 ` Jeff Garzik
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).