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>
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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
iounmap(r8a66597->sudmac_reg);
free_irq(platform_get_irq(pdev, 0), r8a66597);
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
iounmap(r8a66597->sudmac_reg);
free_irq(platform_get_irq(pdev, 0), r8a66597);
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
if (r8a66597->pdata->on_chip) {
clk_disable(r8a66597->clk);
clk_put(r8a66597->clk);
}
if (r8a66597->pdata->on_chip) {
clk_disable(r8a66597->clk);
clk_put(r8a66597->clk);
}
device_unregister(&r8a66597->gadget.dev);
kfree(r8a66597);
return 0;
device_unregister(&r8a66597->gadget.dev);
kfree(r8a66597);
return 0;
static int __init r8a66597_probe(struct platform_device *pdev)
{
static int __init r8a66597_probe(struct platform_device *pdev)
{
struct resource *res, *ires;
int irq;
void __iomem *reg = NULL;
struct resource *res, *ires;
int irq;
void __iomem *reg = NULL;
r8a66597->timer.data = (unsigned long)r8a66597;
r8a66597->reg = reg;
r8a66597->timer.data = (unsigned long)r8a66597;
r8a66597->reg = reg;
if (r8a66597->pdata->on_chip) {
snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);
r8a66597->clk = clk_get(&pdev->dev, clk_name);
if (r8a66597->pdata->on_chip) {
snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);
r8a66597->clk = clk_get(&pdev->dev, clk_name);
}
clk_enable(r8a66597->clk);
}
}
clk_enable(r8a66597->clk);
}
if (r8a66597->pdata->sudmac) {
ret = r8a66597_sudmac_ioremap(r8a66597, pdev);
if (ret < 0)
if (r8a66597->pdata->sudmac) {
ret = r8a66597_sudmac_ioremap(r8a66597, pdev);
if (ret < 0)
clean_up3:
free_irq(irq, r8a66597);
clean_up2:
clean_up3:
free_irq(irq, r8a66597);
clean_up2:
if (r8a66597->pdata->on_chip) {
clk_disable(r8a66597->clk);
clk_put(r8a66597->clk);
}
clean_up_dev:
if (r8a66597->pdata->on_chip) {
clk_disable(r8a66597->clk);
clk_put(r8a66597->clk);
}
clean_up_dev:
device_unregister(&r8a66597->gadget.dev);
clean_up:
if (r8a66597) {
device_unregister(&r8a66597->gadget.dev);
clean_up:
if (r8a66597) {
#ifndef __R8A66597_H__
#define __R8A66597_H__
#ifndef __R8A66597_H__
#define __R8A66597_H__
#include <linux/usb/r8a66597.h>
#define R8A66597_MAX_SAMPLING 10
#include <linux/usb/r8a66597.h>
#define R8A66597_MAX_SAMPLING 10
void __iomem *reg;
void __iomem *sudmac_reg;
void __iomem *reg;
void __iomem *sudmac_reg;
struct r8a66597_platdata *pdata;
struct usb_gadget gadget;
struct r8a66597_platdata *pdata;
struct usb_gadget gadget;