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

Commit 2b1463dd authored by Viresh Kumar's avatar Viresh Kumar Committed by Linus Torvalds
Browse files

net/c_can: remove conditional compilation of clk code 



With addition of dummy clk_*() calls for non CONFIG_HAVE_CLK cases in clk.h,
there is no need to have clk code enclosed in #ifdef CONFIG_HAVE_CLK, #endif
macros.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Bhupesh Sharma <bhupesh.sharma@st.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: viresh kumar <viresh.linux@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d14fb1e9

drivers/net/can/c_can/c_can_platform.c

+0 −8
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 
	const struct platform_device_id *id;

	struct resource *mem;

	int irq;

#ifdef CONFIG_HAVE_CLK

	struct clk *clk;



	/* get the appropriate clk */
@@ -84,7 +83,6 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 
		ret = -ENODEV;

		goto exit;

	}

#endif



	/* get the platform data */

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -145,10 +143,8 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 


	dev->irq = irq;

	priv->base = addr;

#ifdef CONFIG_HAVE_CLK

	priv->can.clock.freq = clk_get_rate(clk);

	priv->priv = clk;

#endif



	platform_set_drvdata(pdev, dev);

	SET_NETDEV_DEV(dev, &pdev->dev);
@@ -172,10 +168,8 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 
exit_release_mem:

	release_mem_region(mem->start, resource_size(mem));

exit_free_clk:

#ifdef CONFIG_HAVE_CLK

	clk_put(clk);

exit:

#endif

	dev_err(&pdev->dev, "probe failed\n");



	return ret;
@@ -196,9 +190,7 @@ static int __devexit c_can_plat_remove(struct platform_device *pdev) 
	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	release_mem_region(mem->start, resource_size(mem));



#ifdef CONFIG_HAVE_CLK

	clk_put(priv->priv);

#endif



	return 0;

}