From bd137cefa602e7b12514f3d7a63b39ce41b6df66 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@nokia.com>
Date: Mon, 7 Feb 2011 16:08:04 +0200
Subject: [PATCH] --- yaml --- r: 233951 b: refs/heads/master c:
 865212abb5268d56ab5e1035426bbeebba01138e h: refs/heads/master i:   233949:
 ac30c7d498eeff83c4dd62b9f04db13ae42a6018   233947:
 41183105d223e83f85a2b5b5ec76b21c68912474   233943:
 4c9de44a758c97babb229dcbf4521ed1fb4fbc51   233935:
 ba0eea116e90091fc4e72680cbabb230c4e918f1   233919:
 f6cfa10cb06c146cef6237bf7d7a975b71756f3e v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm/mach-omap2/mailbox.c     | 10 ++++------
 trunk/arch/arm/mach-omap2/smartreflex.c | 15 +++------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 1780a17f7a5c..42a57b1151cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 525a11381bcad9a7f55d0bac9c8676fe71819002
+refs/heads/master: 865212abb5268d56ab5e1035426bbeebba01138e
diff --git a/trunk/arch/arm/mach-omap2/mailbox.c b/trunk/arch/arm/mach-omap2/mailbox.c
index 24b88504df0f..0a585dfa9874 100644
--- a/trunk/arch/arm/mach-omap2/mailbox.c
+++ b/trunk/arch/arm/mach-omap2/mailbox.c
@@ -193,12 +193,10 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
 		omap_mbox_type_t irq)
 {
 	struct omap_mbox2_priv *p = mbox->priv;
-	u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
-
-	if (!cpu_is_omap44xx())
-		bit = mbox_read_reg(p->irqdisable) & ~bit;
-
-	mbox_write_reg(bit, p->irqdisable);
+	u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
+	l = mbox_read_reg(p->irqdisable);
+	l &= ~bit;
+	mbox_write_reg(l, p->irqdisable);
 }
 
 static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
diff --git a/trunk/arch/arm/mach-omap2/smartreflex.c b/trunk/arch/arm/mach-omap2/smartreflex.c
index 95ac336fe3f7..5a849c981733 100644
--- a/trunk/arch/arm/mach-omap2/smartreflex.c
+++ b/trunk/arch/arm/mach-omap2/smartreflex.c
@@ -926,19 +926,10 @@ static int __init omap_sr_probe(struct platform_device *pdev)
 	}
 
 	for (i = 0; i < sr_info->nvalue_count; i++) {
-		char *name;
-		char volt_name[32];
-
-		name = kzalloc(NVALUE_NAME_LEN + 1, GFP_KERNEL);
-		if (!name) {
-			dev_err(&pdev->dev, "%s: Unable to allocate memory"
-				" for n-value directory name\n",  __func__);
-			return -ENOMEM;
-		}
+		char name[NVALUE_NAME_LEN + 1];
 
-		strcpy(name, "volt_");
-		sprintf(volt_name, "%d", volt_data[i].volt_nominal);
-		strcat(name, volt_name);
+		snprintf(name, sizeof(name), "volt_%d",
+			 volt_data[i].volt_nominal);
 		(void) debugfs_create_x32(name, S_IRUGO | S_IWUSR, nvalue_dir,
 				&(sr_info->nvalue_table[i].nvalue));
 	}