summaryrefslogtreecommitdiff
path: root/patches.tizen/0582-clk-max77686-Make-max77686_clk_register-return-struc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches.tizen/0582-clk-max77686-Make-max77686_clk_register-return-struc.patch')
-rw-r--r--patches.tizen/0582-clk-max77686-Make-max77686_clk_register-return-struc.patch74
1 files changed, 74 insertions, 0 deletions
diff --git a/patches.tizen/0582-clk-max77686-Make-max77686_clk_register-return-struc.patch b/patches.tizen/0582-clk-max77686-Make-max77686_clk_register-return-struc.patch
new file mode 100644
index 00000000000..092a1992d75
--- /dev/null
+++ b/patches.tizen/0582-clk-max77686-Make-max77686_clk_register-return-struc.patch
@@ -0,0 +1,74 @@
+From 01c520d31adda98d287f7e5a1ba24e0dd5f0ee42 Mon Sep 17 00:00:00 2001
+From: Tomasz Figa <t.figa@samsung.com>
+Date: Fri, 23 Aug 2013 18:59:40 +0200
+Subject: [PATCH 0582/1302] clk: max77686: Make max77686_clk_register() return
+ struct clk *
+
+As a preparation for further patches, this patch modifies the clock
+registration helper function to return a pointer to the newly registered
+clock. No functional change is done to the driver.
+
+Signed-off-by: Tomasz Figa <t.figa@samsung.com>
+Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
+---
+ drivers/clk/clk-max77686.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c
+index 5d78460..2e6ba0e 100644
+--- a/drivers/clk/clk-max77686.c
++++ b/drivers/clk/clk-max77686.c
+@@ -112,27 +112,26 @@ static struct clk_init_data max77686_clks_init[MAX77686_CLKS_NUM] = {
+ },
+ };
+
+-static int max77686_clk_register(struct device *dev,
++static struct clk *max77686_clk_register(struct device *dev,
+ struct max77686_clk *max77686)
+ {
+ struct clk *clk;
+ struct clk_hw *hw = &max77686->hw;
+
+ clk = clk_register(dev, hw);
+-
+ if (IS_ERR(clk))
+- return -ENOMEM;
++ return clk;
+
+ max77686->lookup = kzalloc(sizeof(struct clk_lookup), GFP_KERNEL);
+ if (!max77686->lookup)
+- return -ENOMEM;
++ return ERR_PTR(-ENOMEM);
+
+ max77686->lookup->con_id = hw->init->name;
+ max77686->lookup->clk = clk;
+
+ clkdev_add(max77686->lookup);
+
+- return 0;
++ return clk;
+ }
+
+ static int max77686_clk_probe(struct platform_device *pdev)
+@@ -154,12 +153,16 @@ static int max77686_clk_probe(struct platform_device *pdev)
+ }
+
+ for (i = 0; i < MAX77686_CLKS_NUM; i++) {
++ struct clk *clk;
++
+ max77686_clks[i]->iodev = iodev;
+ max77686_clks[i]->mask = 1 << i;
+ max77686_clks[i]->hw.init = &max77686_clks_init[i];
+
+- ret = max77686_clk_register(&pdev->dev, max77686_clks[i]);
+- if (ret) {
++ clk = max77686_clk_register(&pdev->dev, max77686_clks[i]);
++ if (IS_ERR(clk)) {
++ ret = PTR_ERR(clk);
++
+ switch (i) {
+ case MAX77686_CLK_AP:
+ dev_err(&pdev->dev, "Fail to register CLK_AP\n");
+--
+1.8.3.2
+