[PATCH 1/2] hwspinlock/u8500: fix build error due to undefined label

[PATCH 1/2] hwspinlock/u8500: fix build error due to undefined label

[Axel Lin]

Fix below build error:

  CC      drivers/hwspinlock/u8500_hsem.o
drivers/hwspinlock/u8500_hsem.c: In function 'u8500_hsem_probe':
drivers/hwspinlock/u8500_hsem.c:113: error: label 'free_state' used but not defined

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/hwspinlock/u8500_hsem.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c
index 143461a..a120f14 100644
--- a/drivers/hwspinlock/u8500_hsem.c
+++ b/drivers/hwspinlock/u8500_hsem.c
@@ -108,10 +108,8 @@ static int __devinit u8500_hsem_probe(struct platform_device *pdev)
 		return -ENODEV;
 
 	io_base = ioremap(res->start, resource_size(res));
-	if (!io_base) {
-		ret = -ENOMEM;
-		goto free_state;
-	}
+	if (!io_base)
+		return -ENOMEM;
 
 	/* make sure protocol 1 is selected */
 	val = readl(io_base + HSEM_CTRL_REG);
-- 
1.7.5.4

[PATCH 2/2] hwspinlock/u8500: include linux/module.h

[Axel Lin]

Include module.h to fix below build error:

  CC      drivers/hwspinlock/u8500_hsem.o
drivers/hwspinlock/u8500_hsem.c:177: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/hwspinlock/u8500_hsem.c:194: error: expected declaration specifiers or '...' before string constant
drivers/hwspinlock/u8500_hsem.c:194: warning: data definition has no type or storage class
drivers/hwspinlock/u8500_hsem.c:194: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/hwspinlock/u8500_hsem.c:194: warning: function declaration isn't a prototype
drivers/hwspinlock/u8500_hsem.c:195: error: expected declaration specifiers or '...' before string constant
drivers/hwspinlock/u8500_hsem.c:195: warning: data definition has no type or storage class
drivers/hwspinlock/u8500_hsem.c:195: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/hwspinlock/u8500_hsem.c:195: warning: function declaration isn't a prototype
drivers/hwspinlock/u8500_hsem.c:196: error: expected declaration specifiers or '...' before string constant
drivers/hwspinlock/u8500_hsem.c:196: warning: data definition has no type or storage class
drivers/hwspinlock/u8500_hsem.c:196: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/hwspinlock/u8500_hsem.c:196: warning: function declaration isn't a prototype
make[2]: *** [drivers/hwspinlock/u8500_hsem.o] Error 1
make[1]: *** [drivers/hwspinlock] Error 2
make: *** [drivers] Error 2

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
I got the build error on linux-next 20111104.
Axel
 drivers/hwspinlock/u8500_hsem.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c
index a120f14..86980fe 100644
--- a/drivers/hwspinlock/u8500_hsem.c
+++ b/drivers/hwspinlock/u8500_hsem.c
@@ -21,6 +21,7 @@
  * General Public License for more details.
  */
 
+#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/pm_runtime.h>
-- 
1.7.5.4

Re: [PATCH 2/2] hwspinlock/u8500: include linux/module.h

[Linus Walleij]

On Sun, Nov 6, 2011 at 2:16 PM, Axel Lin <axel.lin@gmail.com> wrote:

> Include module.h to fix below build error:

Thanks for always fixing our build errors Axel,
Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 1/2] hwspinlock/u8500: fix build error due to undefined label

[Ohad Ben-Cohen]

On Sun, Nov 6, 2011 at 3:14 PM, Axel Lin <axel.lin@gmail.com> wrote:
> Fix below build error:

Applied both patches, thanks !