Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352463
b: refs/heads/master
c: 41a2060
h: refs/heads/master
i:
  352461: 81b14cc
  352459: e9632e3
  352455: 704e3a5
  352447: 89efcc5
v: v3
  • Loading branch information
Claudiu Manoil authored and David S. Miller committed Feb 14, 2013
1 parent 53b0a76 commit 1080b12
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e0376d004307e2b882afcf9e73b2ed5b66d57aee
refs/heads/master: 41a2060976ca879a68108ffb181dc429d556adce
4 changes: 0 additions & 4 deletions trunk/drivers/net/ethernet/freescale/gianfar.c
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,6 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
return -ENOMEM;

priv = netdev_priv(dev);
priv->node = ofdev->dev.of_node;
priv->ndev = dev;

priv->num_tx_queues = num_tx_qs;
Expand Down Expand Up @@ -1001,7 +1000,6 @@ static int gfar_probe(struct platform_device *ofdev)
priv = netdev_priv(dev);
priv->ndev = dev;
priv->ofdev = ofdev;
priv->node = ofdev->dev.of_node;
SET_NETDEV_DEV(dev, &ofdev->dev);

spin_lock_init(&priv->bflock);
Expand Down Expand Up @@ -1038,8 +1036,6 @@ static int gfar_probe(struct platform_device *ofdev)
/* Set the dev->base_addr to the gfar reg region */
dev->base_addr = (unsigned long) regs;

SET_NETDEV_DEV(dev, &ofdev->dev);

/* Fill in the dev structure */
dev->watchdog_timeo = TX_TIMEOUT;
dev->mtu = 1500;
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/net/ethernet/freescale/gianfar.h
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,6 @@ struct gfar_private {
unsigned int total_tx_ring_size;
unsigned int total_rx_ring_size;

struct device_node *node;
struct net_device *ndev;
struct platform_device *ofdev;
enum gfar_errata errata;
Expand Down

0 comments on commit 1080b12

Please sign in to comment.