Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Viresh Kumar <viresh.kumar@st.com>
Acked-by: David 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Viresh Kumar and committed by
Linus Torvalds
2b1463dd d14fb1e9

-8
-8
drivers/net/can/c_can/c_can_platform.c
··· 74 74 const struct platform_device_id *id; 75 75 struct resource *mem; 76 76 int irq; 77 - #ifdef CONFIG_HAVE_CLK 78 77 struct clk *clk; 79 78 80 79 /* get the appropriate clk */ ··· 83 84 ret = -ENODEV; 84 85 goto exit; 85 86 } 86 - #endif 87 87 88 88 /* get the platform data */ 89 89 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); ··· 143 145 144 146 dev->irq = irq; 145 147 priv->base = addr; 146 - #ifdef CONFIG_HAVE_CLK 147 148 priv->can.clock.freq = clk_get_rate(clk); 148 149 priv->priv = clk; 149 - #endif 150 150 151 151 platform_set_drvdata(pdev, dev); 152 152 SET_NETDEV_DEV(dev, &pdev->dev); ··· 168 172 exit_release_mem: 169 173 release_mem_region(mem->start, resource_size(mem)); 170 174 exit_free_clk: 171 - #ifdef CONFIG_HAVE_CLK 172 175 clk_put(clk); 173 176 exit: 174 - #endif 175 177 dev_err(&pdev->dev, "probe failed\n"); 176 178 177 179 return ret; ··· 190 196 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); 191 197 release_mem_region(mem->start, resource_size(mem)); 192 198 193 - #ifdef CONFIG_HAVE_CLK 194 199 clk_put(priv->priv); 195 - #endif 196 200 197 201 return 0; 198 202 }