Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16d8614b authored Dec 23, 2014 by Appana Durga Kedareswara Rao Committed by David S. Miller Dec 26, 2014

net: xilinx: Remove unnecessary temac_property in the driver

This property is no longer used in the code yet the code looks for it in the device tree.
It does not cause an error if it's not in the tree.

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d0e1df9c

drivers/net/ethernet/xilinx/xilinx_axienet.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -388,7 +388,6 @@ struct axidma_bd {
	* @dma_err_tasklet: Tasklet structure to process Axi DMA errors		* @dma_err_tasklet: Tasklet structure to process Axi DMA errors
	* @tx_irq: Axidma TX IRQ number		* @tx_irq: Axidma TX IRQ number
	* @rx_irq: Axidma RX IRQ number		* @rx_irq: Axidma RX IRQ number
	* @temac_type: axienet type to identify between soft and hard temac
	* @phy_type: Phy type to identify between MII/GMII/RGMII/SGMII/1000 Base-X		* @phy_type: Phy type to identify between MII/GMII/RGMII/SGMII/1000 Base-X
	* @options: AxiEthernet option word		* @options: AxiEthernet option word
	* @last_link: Phy link state in which the PHY was negotiated earlier		* @last_link: Phy link state in which the PHY was negotiated earlier
	@@ -431,7 +430,6 @@ struct axienet_local {

	int tx_irq;		int tx_irq;
	int rx_irq;		int rx_irq;
	u32 temac_type;
	u32 phy_type;		u32 phy_type;

	u32 options; /* Current options word */		u32 options; /* Current options word */

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1555,10 +1555,6 @@ static int axienet_of_probe(struct platform_device *op)
	if ((be32_to_cpup(p)) >= 0x4000)		if ((be32_to_cpup(p)) >= 0x4000)
	lp->jumbo_support = 1;		lp->jumbo_support = 1;
	}		}
	p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,temac-type",
	NULL);
	if (p)
	lp->temac_type = be32_to_cpup(p);
	p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,phy-type", NULL);		p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,phy-type", NULL);
	if (p)		if (p)
	lp->phy_type = be32_to_cpup(p);		lp->phy_type = be32_to_cpup(p);