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

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

ata/pata_arasan: 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: Jeff Garzik <jgarzik@redhat.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 08aff535

drivers/ata/pata_arasan_cf.c

+1 −13
Original line number Original line Diff line number Diff line
@@ -184,10 +184,8 @@ 
struct arasan_cf_dev {

struct arasan_cf_dev {

	/* pointer to ata_host structure */

	/* pointer to ata_host structure */

	struct ata_host *host;

	struct ata_host *host;

	/* clk structure, only if HAVE_CLK is defined */

	/* clk structure */

#ifdef CONFIG_HAVE_CLK

	struct clk *clk;

	struct clk *clk;

#endif





	/* physical base address of controller */

	/* physical base address of controller */

	dma_addr_t pbase;

	dma_addr_t pbase;
@@ -312,13 +310,11 @@ static int cf_init(struct arasan_cf_dev *acdev) 
	unsigned long flags;

	unsigned long flags;

	int ret = 0;

	int ret = 0;





#ifdef CONFIG_HAVE_CLK

	ret = clk_enable(acdev->clk);

	ret = clk_enable(acdev->clk);

	if (ret) {

	if (ret) {

		dev_dbg(acdev->host->dev, "clock enable failed");

		dev_dbg(acdev->host->dev, "clock enable failed");

		return ret;

		return ret;

	}

	}

#endif





	spin_lock_irqsave(&acdev->host->lock, flags);

	spin_lock_irqsave(&acdev->host->lock, flags);

	/* configure CF interface clock */

	/* configure CF interface clock */
@@ -344,9 +340,7 @@ static void cf_exit(struct arasan_cf_dev *acdev) 
	writel(readl(acdev->vbase + OP_MODE) & ~CFHOST_ENB,

	writel(readl(acdev->vbase + OP_MODE) & ~CFHOST_ENB,

			acdev->vbase + OP_MODE);

			acdev->vbase + OP_MODE);

	spin_unlock_irqrestore(&acdev->host->lock, flags);

	spin_unlock_irqrestore(&acdev->host->lock, flags);

#ifdef CONFIG_HAVE_CLK

	clk_disable(acdev->clk);

	clk_disable(acdev->clk);

#endif

}

}





static void dma_callback(void *dev)

static void dma_callback(void *dev)
@@ -828,13 +822,11 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





#ifdef CONFIG_HAVE_CLK

	acdev->clk = clk_get(&pdev->dev, NULL);

	acdev->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(acdev->clk)) {

	if (IS_ERR(acdev->clk)) {

		dev_warn(&pdev->dev, "Clock not found\n");

		dev_warn(&pdev->dev, "Clock not found\n");

		return PTR_ERR(acdev->clk);

		return PTR_ERR(acdev->clk);

	}

	}

#endif





	/* allocate host */

	/* allocate host */

	host = ata_host_alloc(&pdev->dev, 1);

	host = ata_host_alloc(&pdev->dev, 1);
@@ -899,9 +891,7 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev) 
			&arasan_cf_sht);

			&arasan_cf_sht);





free_clk:

free_clk:

#ifdef CONFIG_HAVE_CLK

	clk_put(acdev->clk);

	clk_put(acdev->clk);

#endif

	return ret;

	return ret;

}

}
@@ -912,9 +902,7 @@ static int __devexit arasan_cf_remove(struct platform_device *pdev) 




	ata_host_detach(host);

	ata_host_detach(host);

	cf_exit(acdev);

	cf_exit(acdev);

#ifdef CONFIG_HAVE_CLK

	clk_put(acdev->clk);

	clk_put(acdev->clk);

#endif





	return 0;

	return 0;

}

}