From patchwork Fri Jul 27 12:45:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10320 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 900FE23E23 for ; Fri, 27 Jul 2012 12:46:21 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 5F1C7A19135 for ; Fri, 27 Jul 2012 12:46:21 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so3108301ggn.11 for ; Fri, 27 Jul 2012 05:46:21 -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=9OKZiZ+0DCl6XwmJ5mjUjV6Qk0yvERNT4YmmRgFiNJ0=; b=UW/UkTY19EDyKTQMU1dJRU1+T1EnSkMfvx1DgEs8lV0Xz3siWgBk22ci6VwwtucTn+ 2lh72QWG0BMXnMnLtgweiYdQq9j7Q7xJSedieeQXVEa4QVS01MZEbJSAPi+fnRE3ImID cPl5345E/R8dHPzO/1JaGPDdxsYpYEJZUBUvdWIsy4pTmdGagJKMZOrVV/8BtXzJz9Ae P/hdcixECUln7+7WF+Mvpcn4NF8TLLWNKicPiSJ4RgF5xNQyxcB7w5DCgpEi/BIy2F7K zg2j92+ydyYPSxzDD2anpJiPROOL7/cDkGiy2qKV7D/NCLariRwvhFGDC6pVqZ+M136n zmQw== Received: by 10.50.182.229 with SMTP id eh5mr4508617igc.38.1343393181035; Fri, 27 Jul 2012 05:46:21 -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.43.93.3 with SMTP id bs3csp29849icc; Fri, 27 Jul 2012 05:46:20 -0700 (PDT) Received: by 10.180.14.34 with SMTP id m2mr5878048wic.21.1343393179602; Fri, 27 Jul 2012 05:46:19 -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 i4si6684588wiv.45.2012.07.27.05.46.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 05:46:19 -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 u7so2422355wey.37 for ; Fri, 27 Jul 2012 05:46:19 -0700 (PDT) Received: by 10.180.89.235 with SMTP id br11mr5999958wib.3.1343393179148; Fri, 27 Jul 2012 05:46:19 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id dc3sm12342025wib.7.2012.07.27.05.46.17 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 05:46:18 -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, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, lrg@ti.com, broonie@opensource.wolfsonmicro.com, Lee Jones Subject: [PATCH 07/18] ARM: ux500: Clean-up MSP platform code Date: Fri, 27 Jul 2012 13:45:51 +0100 Message-Id: <1343393162-11938-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343393162-11938-1-git-send-email-lee.jones@linaro.org> References: <1343393162-11938-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnUwFf1Fx83UV4keMLqLX4eVR5CIHSDj0f17Z3cA9IuDFWH7vQn3MpxOlwhSu3Jbq8AP48i 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'. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-msp.c | 26 ++++++++++++-------------- arch/arm/mach-ux500/board-mop500-msp.h | 14 -------------- arch/arm/mach-ux500/board-mop500.c | 1 - arch/arm/mach-ux500/board-mop500.h | 3 +++ 4 files changed, 15 insertions(+), 29 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 a740e8a..719db15 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -144,21 +144,21 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent, } /* Platform device for ASoC U8500 machine */ -static struct platform_device snd_soc_u8500 = { - .name = "snd-soc-u8500", - .id = 0, - .dev = { - .platform_data = NULL, - }, +static struct platform_device snd_soc_mop500 = { + .name = "snd-soc-mop500", + .id = 0, + .dev = { + .platform_data = NULL, + }, }; /* Platform device for Ux500-PCM */ static struct platform_device ux500_pcm = { - .name = "ux500-pcm", - .id = 0, - .dev = { - .platform_data = NULL, - }, + .name = "ux500-pcm", + .id = 0, + .dev = { + .platform_data = NULL, + }, }; static struct msp_i2s_platform_data msp2_platform_data = { @@ -174,7 +174,7 @@ static struct msp_i2s_platform_data msp3_platform_data = { .use_pinctrl = true, }; -int mop500_msp_init(struct device *parent) +void mop500_msp_init(struct device *parent) { pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__); platform_device_register(&snd_soc_mop500); @@ -191,6 +191,4 @@ int mop500_msp_init(struct device *parent) pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__); platform_device_register(&ux500_pcm); - - 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 87a5cd7..6f53a6f 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 d04a8e6..1d7316b 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -92,6 +92,9 @@ 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); +/* Due for removal once the MSP driver has been fully DT:ed. */ +void mop500_of_msp_init(struct device *parent); int __init mop500_uib_init(void); void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,