From patchwork Thu Sep 20 12:12:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11553 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DEB6D1B4E37 for ; Thu, 20 Sep 2012 12:13:33 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4C7F7A1922F for ; Thu, 20 Sep 2012 12:13:33 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so1561861iaf.11 for ; Thu, 20 Sep 2012 05:13:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=zR7uGZpHeKv9wo2bXIxLZ53/poycI+/Ov08t6MUVovM=; b=O3Ubh5rGmJ7Pu7CgdZ2H9k0O8+yhRu8Qwws29ZKDDlOZUfKRFkEgmQlUQEyOYLdHCk yQAJnxsM17+G3VUS+dqzOTf9F6a/DcH3pnxrc8VaNEOCl3NgJdNOfGqp0jUfyLXFAWL4 BzHrKtTOcQy6H4cijKFn03ZxPOq1kmy8Ec0bQV96OyhGC1HKCCY+tZAMJtsR6jUfiiGv gIBaPCB0ajUuOdZ08i9NTK8KI1ubHlX4JnM2nYPkvLy4Q2SUWZMfJN40RSy3DOmRYBJO +VU46QkrbMe2HyNycQTQ6xWhsU7K50IiYY0lbbSdAR1fHAMELs1A8Mf4Xxweb7Dv/JCz yF5w== Received: by 10.50.217.229 with SMTP id pb5mr1464088igc.28.1348143213020; Thu, 20 Sep 2012 05:13:33 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp71619igc; Thu, 20 Sep 2012 05:13:32 -0700 (PDT) Received: by 10.180.74.133 with SMTP id t5mr5679949wiv.2.1348143211728; Thu, 20 Sep 2012 05:13:31 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id m46si7293106wea.138.2012.09.20.05.13.31 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:31 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f178.google.com with SMTP id u7so1482366wey.37 for ; Thu, 20 Sep 2012 05:13:31 -0700 (PDT) Received: by 10.180.104.200 with SMTP id gg8mr4128200wib.14.1348143211251; Thu, 20 Sep 2012 05:13:31 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPS id w7sm32394460wiz.0.2012.09.20.05.13.29 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:30 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, olof.johansson@gmail.com, Lee Jones Subject: [PATCH 16/32] ARM: ux500: Clean-up MSP platform code Date: Thu, 20 Sep 2012 14:12:34 +0200 Message-Id: <1348143170-2130-17-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> References: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmvUeqKJuqzs7M5N91U2aamb5DnqhrMKupqv0iFQTHh8z8aBQxvbNl42CHaJodExJJ+v7vI This patch contains a couple of general MSP clean-ups pertaining to layout changes and changing functions to be void instead of int instead of regardlessly returning '0'. Acked-by: Ola Lilja Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-msp.c | 14 ++++++-------- arch/arm/mach-ux500/board-mop500-msp.h | 14 -------------- arch/arm/mach-ux500/board-mop500.c | 1 - arch/arm/mach-ux500/board-mop500.h | 1 + 4 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 arch/arm/mach-ux500/board-mop500-msp.h diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index ace6c05..dcf5ea9 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -143,11 +143,11 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent, /* Platform device for ASoC MOP500 machine */ static struct platform_device snd_soc_mop500 = { - .name = "snd-soc-mop500", - .id = 0, - .dev = { - .platform_data = NULL, - }, + .name = "snd-soc-mop500", + .id = 0, + .dev = { + .platform_data = NULL, + }, }; /* Platform device for Ux500-PCM */ @@ -171,7 +171,7 @@ static struct msp_i2s_platform_data msp3_platform_data = { .msp_i2s_dma_tx = NULL, }; -int mop500_msp_init(struct device *parent) +void mop500_msp_init(struct device *parent) { pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__); platform_device_register(&snd_soc_mop500); @@ -185,6 +185,4 @@ int mop500_msp_init(struct device *parent) &msp2_platform_data); db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1, &msp3_platform_data); - - return 0; } diff --git a/arch/arm/mach-ux500/board-mop500-msp.h b/arch/arm/mach-ux500/board-mop500-msp.h deleted file mode 100644 index 6fcfb5e..0000000 --- a/arch/arm/mach-ux500/board-mop500-msp.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2012 - * - * Author: Ola Lilja , - * for ST-Ericsson. - * - * License terms: - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - */ - -void mop500_msp_init(struct device *parent); diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 8890b19..a799477 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -54,7 +54,6 @@ #include "devices-db8500.h" #include "board-mop500.h" #include "board-mop500-regulators.h" -#include "board-mop500-msp.h" static struct gpio_led snowball_led_array[] = { { diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index eb421f9..bdae9b0 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -94,6 +94,7 @@ void __init mop500_stuib_init(void); void __init mop500_pinmaps_init(void); void __init snowball_pinmaps_init(void); void __init hrefv60_pinmaps_init(void); +void mop500_msp_init(struct device *parent); int __init mop500_uib_init(void); void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,