From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755277Ab0IMTsa (ORCPT ); Mon, 13 Sep 2010 15:48:30 -0400 Received: from mail.perches.com ([173.55.12.10]:1871 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753386Ab0IMTsZ (ORCPT ); Mon, 13 Sep 2010 15:48:25 -0400 From: Joe Perches To: linux-kernel@vger.kernel.org Cc: Linus Walleij , "Jean Delvare (PC drivers, core)" , "Ben Dooks (embedded platforms)" , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org Subject: [PATCH 05/25] drivers/i2c: Use static const char arrays Date: Mon, 13 Sep 2010 12:47:43 -0700 Message-Id: X-Mailer: git-send-email 1.7.3.rc1 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Joe Perches --- drivers/i2c/busses/i2c-stu300.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c index 495be45..2f7c09c 100644 --- a/drivers/i2c/busses/i2c-stu300.c +++ b/drivers/i2c/busses/i2c-stu300.c @@ -871,7 +871,7 @@ stu300_probe(struct platform_device *pdev) struct resource *res; int bus_nr; int ret = 0; - char clk_name[] = "I2C0"; + char clk_name[sizeof("I2Cx")]; dev = kzalloc(sizeof(struct stu300_dev), GFP_KERNEL); if (!dev) { @@ -881,7 +881,7 @@ stu300_probe(struct platform_device *pdev) } bus_nr = pdev->id; - clk_name[3] += (char)bus_nr; + sprintf(clk_name, "I2C%c", '0' + bus_nr); dev->clk = clk_get(&pdev->dev, clk_name); if (IS_ERR(dev->clk)) { ret = PTR_ERR(dev->clk); -- 1.7.3.rc1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Perches Subject: [PATCH 05/25] drivers/i2c: Use static const char arrays Date: Mon, 13 Sep 2010 12:47:43 -0700 Message-ID: References: Return-path: In-Reply-To: Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Linus Walleij , "Jean Delvare (PC drivers, core)" , "Ben Dooks (embedded platforms)" , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-i2c@vger.kernel.org Signed-off-by: Joe Perches --- drivers/i2c/busses/i2c-stu300.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c index 495be45..2f7c09c 100644 --- a/drivers/i2c/busses/i2c-stu300.c +++ b/drivers/i2c/busses/i2c-stu300.c @@ -871,7 +871,7 @@ stu300_probe(struct platform_device *pdev) struct resource *res; int bus_nr; int ret = 0; - char clk_name[] = "I2C0"; + char clk_name[sizeof("I2Cx")]; dev = kzalloc(sizeof(struct stu300_dev), GFP_KERNEL); if (!dev) { @@ -881,7 +881,7 @@ stu300_probe(struct platform_device *pdev) } bus_nr = pdev->id; - clk_name[3] += (char)bus_nr; + sprintf(clk_name, "I2C%c", '0' + bus_nr); dev->clk = clk_get(&pdev->dev, clk_name); if (IS_ERR(dev->clk)) { ret = PTR_ERR(dev->clk); -- 1.7.3.rc1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: joe@perches.com (Joe Perches) Date: Mon, 13 Sep 2010 12:47:43 -0700 Subject: [PATCH 05/25] drivers/i2c: Use static const char arrays In-Reply-To: References: Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Signed-off-by: Joe Perches --- drivers/i2c/busses/i2c-stu300.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c index 495be45..2f7c09c 100644 --- a/drivers/i2c/busses/i2c-stu300.c +++ b/drivers/i2c/busses/i2c-stu300.c @@ -871,7 +871,7 @@ stu300_probe(struct platform_device *pdev) struct resource *res; int bus_nr; int ret = 0; - char clk_name[] = "I2C0"; + char clk_name[sizeof("I2Cx")]; dev = kzalloc(sizeof(struct stu300_dev), GFP_KERNEL); if (!dev) { @@ -881,7 +881,7 @@ stu300_probe(struct platform_device *pdev) } bus_nr = pdev->id; - clk_name[3] += (char)bus_nr; + sprintf(clk_name, "I2C%c", '0' + bus_nr); dev->clk = clk_get(&pdev->dev, clk_name); if (IS_ERR(dev->clk)) { ret = PTR_ERR(dev->clk); -- 1.7.3.rc1