From patchwork Fri Mar 29 21:05:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2366681 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CBE82400E6 for ; Fri, 29 Mar 2013 21:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757055Ab3C2VF5 (ORCPT ); Fri, 29 Mar 2013 17:05:57 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:61395 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757002Ab3C2VF4 (ORCPT ); Fri, 29 Mar 2013 17:05:56 -0400 Received: from axis700.grange (dslb-178-001-229-203.pools.arcor-ip.net [178.1.229.203]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0LfSYr-1V1xJw4C2j-00p2oI; Fri, 29 Mar 2013 22:05:54 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 97F1F40BB3; Fri, 29 Mar 2013 22:05:53 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1ULgUi-0001Fh-Bt; Fri, 29 Mar 2013 22:05:52 +0100 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: Simon Horman , Magnus Damm , Laurent Pinchart , Guennadi Liakhovetski Subject: [PATCH v3 1/5] ARM: shmobile: mackerel: SDHI resources do not have to be numbered Date: Fri, 29 Mar 2013 22:05:48 +0100 Message-Id: <1364591152-4780-2-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1364591152-4780-1-git-send-email-g.liakhovetski@gmx.de> References: <1364591152-4780-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:Rinvv+5CExzcUSYp7fifr5XNtSjrscCYOJwSRzvEe9G mQCN+emi4aa9JOcZIQJrjtw5jCx6DV8IajlYcWdenblUdUc6D7 SsrRhlWoaNaADV6svfLHboFJqBG0x2twDvLx6Ab2YT3iq2KPdm /2Zt+414w8i7UxuAvJscwaxBG+JeZ74sIaq6lwNNLV11Akvb2W 1ivt+jUGJgLtG7RDoRVFshIP5Owm2rOAuIqFfIdw9wCG+pMxub a7r2E3CH2qjuAizi5SZgFep9HJNKt7Oa0DNV7UaODIhzWiwi0h Re6nwLh9RqmpDyMzu9OdXNMVNCOOmHa4fzl52MZPQ+i2z7OgBB hNZz+rmBd81wMsLImm7BV7aHvN6qC14CYUnLotu4FFaHi6Zq4V WyRF8WZZGfeDw== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org The SDHI driver doesn't care about platform resource order, explicit resource numbering is redundant. Signed-off-by: Guennadi Liakhovetski --- arch/arm/mach-shmobile/board-mackerel.c | 33 +++++++++++------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 1a9c753..c4f80d4 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -982,21 +982,18 @@ static struct sh_mobile_sdhi_info sdhi0_info = { }; static struct resource sdhi0_resources[] = { - [0] = { + { .name = "SDHI0", .start = 0xe6850000, .end = 0xe68500ff, .flags = IORESOURCE_MEM, - }, - [1] = { + }, { .start = evt2irq(0x0e00) /* SDHI0_SDHI0I0 */, .flags = IORESOURCE_IRQ, - }, - [2] = { + }, { .start = evt2irq(0x0e20) /* SDHI0_SDHI0I1 */, .flags = IORESOURCE_IRQ, - }, - [3] = { + }, { .start = evt2irq(0x0e40) /* SDHI0_SDHI0I2 */, .flags = IORESOURCE_IRQ, }, @@ -1025,23 +1022,20 @@ static struct sh_mobile_sdhi_info sdhi1_info = { }; static struct resource sdhi1_resources[] = { - [0] = { + { .name = "SDHI1", .start = 0xe6860000, .end = 0xe68600ff, .flags = IORESOURCE_MEM, - }, - [1] = { + }, { .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, .start = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */ .flags = IORESOURCE_IRQ, - }, - [2] = { + }, { .name = SH_MOBILE_SDHI_IRQ_SDCARD, .start = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */ .flags = IORESOURCE_IRQ, - }, - [3] = { + }, { .name = SH_MOBILE_SDHI_IRQ_SDIO, .start = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */ .flags = IORESOURCE_IRQ, @@ -1079,23 +1073,20 @@ static struct sh_mobile_sdhi_info sdhi2_info = { }; static struct resource sdhi2_resources[] = { - [0] = { + { .name = "SDHI2", .start = 0xe6870000, .end = 0xe68700ff, .flags = IORESOURCE_MEM, - }, - [1] = { + }, { .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, .start = evt2irq(0x1200), /* SDHI2_SDHI2I0 */ .flags = IORESOURCE_IRQ, - }, - [2] = { + }, { .name = SH_MOBILE_SDHI_IRQ_SDCARD, .start = evt2irq(0x1220), /* SDHI2_SDHI2I1 */ .flags = IORESOURCE_IRQ, - }, - [3] = { + }, { .name = SH_MOBILE_SDHI_IRQ_SDIO, .start = evt2irq(0x1240), /* SDHI2_SDHI2I2 */ .flags = IORESOURCE_IRQ,