From: Dirk Behme <dirk.behme@googlemail.com>
Date: Wed, 1 Nov 2006 19:52:59 +0000 (+0200)
Subject: ARM: OMAP: Fix warnings in plat-omap
X-Git-Tag: v2.6.19-omap1~94
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1db0d53cb964c8a371c9cd1f15c6746e07d53d77;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix warnings in plat-omap

Fix warnings

arch/arm/plat-omap/dmtimer.c: In function
'omap_dm_timer_modify_idlect_mask':
arch/arm/plat-omap/dmtimer.c:317: warning: no return
statement in function returning non-void

arch/arm/plat-omap/mailbox.c: In function 'omap_mbox_init':
arch/arm/plat-omap/mailbox.c:231: warning: ignoring return
value of 'class_device_create_file', declared with attribute
warn_unused_result

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 55b10ce23e6..d68d18e2ddd 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -314,6 +314,8 @@ struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
 __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
 {
 	BUG();
+
+	return 0;
 }
 
 #endif
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 96e5ad0b76e..ab72f22fa22 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -228,7 +228,12 @@ static int omap_mbox_init(struct omap_mbox *mbox)
 	if (unlikely(ret))
 		return ret;
 
-	class_device_create_file(&mbox->class_dev, &class_device_attr_mbox);
+	ret = class_device_create_file(&mbox->class_dev, &class_device_attr_mbox);
+	if (unlikely(ret)) {
+		printk(KERN_ERR
+		       "class_device_create_file failed: %d\n", ret);
+		goto fail1;
+	}
 
 	ret = request_irq(mbox->irq, mbox_interrupt, SA_INTERRUPT,
 			  mbox->name, mbox);