Re: [RFC PATCH v2 05/11] MIPS: Alchemy: pci: use clk framework to enable PCI clock

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello.

On 07/03/2014 05:22 PM, Manuel Lauss wrote:

Use the clock framework to get at the PCI clock source and enable
it on driver initialization.

Signed-off-by: Manuel Lauss <manuel.lauss@xxxxxxxxx>
---
  arch/mips/pci/pci-alchemy.c | 23 ++++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c
index 912c5f2..adc810f 100644
--- a/arch/mips/pci/pci-alchemy.c
+++ b/arch/mips/pci/pci-alchemy.c
[...]
@@ -394,11 +396,24 @@ static int alchemy_pci_probe(struct platform_device *pdev)
  		goto out1;
  	}

+	c = clk_get(&pdev->dev, "pci_clko");
+	if (IS_ERR(c)) {
+		dev_err(&pdev->dev, "unable to find PCI clock\n");
+		ret = PTR_ERR(c);
+		goto out2;
+	}
+	ret = clk_prepare_enable(c);
+	if (ret) {
+		dev_err(&pdev->dev, "cannot enable PCI clock\n");
+		clk_put(c);
+		goto out2;

   Isn't it simpler to add one more label before clk_put() at end of function?

+	}
+
[...]
@@ -466,12 +481,18 @@ static int alchemy_pci_probe(struct platform_device *pdev)
  	register_syscore_ops(&alchemy_pci_pmops);
  	register_pci_controller(&ctx->alchemy_pci_ctrl);

+	dev_info(&pdev->dev, "PCI controller at %ld MHz\n",
+		 clk_get_rate(c) / 1000000);
+
  	return 0;

  out4:
  	iounmap(virt_io);
  out3:
  	iounmap(ctx->regs);
+out5:
+	clk_disable_unprepare(c);
+	clk_put(c);
  out2:
  	release_mem_region(r->start, resource_size(r));
  out1:


WBR, Sergei



[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux