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

Commit 9a43a026 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

mv643xx_eth: Fix compile error for architectures without clk. 



Commit 452503eb (ARM: Orion: Eth: Add clk/clkdev support.) broke
the building of the driver on architectures which don't have clk
support. In particular PPC32 Pegasos which uses this driver.

Add #ifdef around the clk API usage.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba27ec66

drivers/net/ethernet/marvell/mv643xx_eth.c

+10 −5
Original line number Diff line number Diff line
@@ -436,7 +436,9 @@ struct mv643xx_eth_private { 
	/*

	 * Hardware-specific parameters.

	 */

#if defined(CONFIG_HAVE_CLK)

	struct clk *clk;

#endif

	unsigned int t_clk;

};
@@ -2895,17 +2897,17 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 
	mp->dev = dev;



	/*

	 * Get the clk rate, if there is one, otherwise use the default.

	 * Start with a default rate, and if there is a clock, allow

	 * it to override the default.

	 */

	mp->t_clk = 133000000;

#if defined(CONFIG_HAVE_CLK)

	mp->clk = clk_get(&pdev->dev, (pdev->id ? "1" : "0"));

	if (!IS_ERR(mp->clk)) {

		clk_prepare_enable(mp->clk);

		mp->t_clk = clk_get_rate(mp->clk);

	} else {

		mp->t_clk = 133000000;

		printk(KERN_WARNING "Unable to get clock");

	}



#endif

	set_params(mp, pd);

	netif_set_real_num_tx_queues(dev, mp->txq_count);

	netif_set_real_num_rx_queues(dev, mp->rxq_count);
@@ -2995,10 +2997,13 @@ static int mv643xx_eth_remove(struct platform_device *pdev) 
		phy_detach(mp->phy);

	cancel_work_sync(&mp->tx_timeout_task);



#if defined(CONFIG_HAVE_CLK)

	if (!IS_ERR(mp->clk)) {

		clk_disable_unprepare(mp->clk);

		clk_put(mp->clk);

	}

#endif



	free_netdev(mp->dev);



	platform_set_drvdata(pdev, NULL);