From 1080b1261df18af5237be594fda306c49b42800a Mon Sep 17 00:00:00 2001 From: Claudiu Manoil Date: Thu, 14 Feb 2013 05:00:01 +0000 Subject: [PATCH] --- yaml --- r: 352463 b: refs/heads/master c: 41a2060976ca879a68108ffb181dc429d556adce h: refs/heads/master i: 352461: 81b14cc1ea7ea72d277655b947bc107756489d74 352459: e9632e3c747a657511b353f7b76260cee83d3166 352455: 704e3a55987b93f21610b6451d210933bd334981 352447: 89efcc5b3766b3312af94b06b8e00e560089f508 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/gianfar.c | 4 ---- trunk/drivers/net/ethernet/freescale/gianfar.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bfd5be814ff4..918a038453fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0376d004307e2b882afcf9e73b2ed5b66d57aee +refs/heads/master: 41a2060976ca879a68108ffb181dc429d556adce diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c index c82f67727f43..2c6b5694b3f0 100644 --- a/trunk/drivers/net/ethernet/freescale/gianfar.c +++ b/trunk/drivers/net/ethernet/freescale/gianfar.c @@ -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; @@ -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); @@ -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; diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.h b/trunk/drivers/net/ethernet/freescale/gianfar.h index 78125f1f870e..8b4de57a5c23 100644 --- a/trunk/drivers/net/ethernet/freescale/gianfar.h +++ b/trunk/drivers/net/ethernet/freescale/gianfar.h @@ -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;