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

Commit 569a50da authored by Viresh Kumar's avatar Viresh Kumar Committed by Linus Torvalds
Browse files

gadget/r8a66597: 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>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 f12a86a0

drivers/usb/gadget/r8a66597-udc.c

+3 −8
Original line number Diff line number Diff line
@@ -1831,12 +1831,12 @@ static int __exit r8a66597_remove(struct platform_device *pdev) 
		iounmap(r8a66597->sudmac_reg);

	free_irq(platform_get_irq(pdev, 0), r8a66597);

	r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);

#ifdef CONFIG_HAVE_CLK



	if (r8a66597->pdata->on_chip) {

		clk_disable(r8a66597->clk);

		clk_put(r8a66597->clk);

	}

#endif



	device_unregister(&r8a66597->gadget.dev);

	kfree(r8a66597);

	return 0;
@@ -1868,9 +1868,7 @@ static int __init r8a66597_sudmac_ioremap(struct r8a66597 *r8a66597, 


static int __init r8a66597_probe(struct platform_device *pdev)

{

#ifdef CONFIG_HAVE_CLK

	char clk_name[8];

#endif

	struct resource *res, *ires;

	int irq;

	void __iomem *reg = NULL;
@@ -1934,7 +1932,6 @@ static int __init r8a66597_probe(struct platform_device *pdev) 
	r8a66597->timer.data = (unsigned long)r8a66597;

	r8a66597->reg = reg;



#ifdef CONFIG_HAVE_CLK

	if (r8a66597->pdata->on_chip) {

		snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);

		r8a66597->clk = clk_get(&pdev->dev, clk_name);
@@ -1946,7 +1943,7 @@ static int __init r8a66597_probe(struct platform_device *pdev) 
		}

		clk_enable(r8a66597->clk);

	}

#endif



	if (r8a66597->pdata->sudmac) {

		ret = r8a66597_sudmac_ioremap(r8a66597, pdev);

		if (ret < 0)
@@ -2006,13 +2003,11 @@ err_add_udc: 
clean_up3:

	free_irq(irq, r8a66597);

clean_up2:

#ifdef CONFIG_HAVE_CLK

	if (r8a66597->pdata->on_chip) {

		clk_disable(r8a66597->clk);

		clk_put(r8a66597->clk);

	}

clean_up_dev:

#endif

	device_unregister(&r8a66597->gadget.dev);

clean_up:

	if (r8a66597) {

drivers/usb/gadget/r8a66597-udc.h

+0 −5
Original line number Diff line number Diff line
@@ -13,10 +13,7 @@ 
#ifndef __R8A66597_H__

#define __R8A66597_H__



#ifdef CONFIG_HAVE_CLK

#include <linux/clk.h>

#endif



#include <linux/usb/r8a66597.h>



#define R8A66597_MAX_SAMPLING	10
@@ -92,9 +89,7 @@ struct r8a66597 { 
	void __iomem		*reg;

	void __iomem		*sudmac_reg;



#ifdef CONFIG_HAVE_CLK

	struct clk *clk;

#endif

	struct r8a66597_platdata	*pdata;



	struct usb_gadget		gadget;