From patchwork Tue May 14 16:20:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamie Iles X-Patchwork-Id: 2567381 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 BD3943FC5A for ; Tue, 14 May 2013 16:20:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752010Ab3ENQUx (ORCPT ); Tue, 14 May 2013 12:20:53 -0400 Received: from mail-ea0-f182.google.com ([209.85.215.182]:60715 "EHLO mail-ea0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904Ab3ENQUv (ORCPT ); Tue, 14 May 2013 12:20:51 -0400 Received: by mail-ea0-f182.google.com with SMTP id r16so445180ead.27 for ; Tue, 14 May 2013 09:20:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent:x-gm-message-state; bh=+nE3mCDyYARrvfWPxumqxytj4yp6uVc6RCCcrnXTLYY=; b=MUdehs8v+94rMoML/LIIdyBzFNttWlhwD5w8hvv/am9Uv5ovzbiFlpDEGosFOMhl2q YGENJta1h5vUHWLyVDEpvG2eorg3WePiwC04DkBc/2Bo7sEmn4nTnb7aR43kUgi/YWg7 E4YIZK5/ptSuWWNmjocHvGitp84OJHTLNYu3DAIsp7hsRIW/+z9fxcurFJcFsMnCTZj6 7itvqijSaDfYmIjEQuE+lTw12JEFIMabO+/QVTSZIxHf2QyLGoqtbW+FwJI+yg9ZquKc oIx45kAtpk+U93DDlz2sVy4+ypypLUvmIgSIaIJo6d1y9afhVBaT67trXZFxyWVlO7lI oDDA== X-Received: by 10.14.211.69 with SMTP id v45mr19014702eeo.45.1368548450158; Tue, 14 May 2013 09:20:50 -0700 (PDT) Received: from localhost ([2.216.16.214]) by mx.google.com with ESMTPSA id x41sm30489001eey.17.2013.05.14.09.20.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 14 May 2013 09:20:49 -0700 (PDT) Date: Tue, 14 May 2013 17:20:46 +0100 From: Jamie Iles To: Maxime Ripard Cc: Michal Simek , Linus Walleij , Jamie Iles , Simon Horman , Magnus Damm , Christian Daudt , Viresh Kumar , David Brown , Jason Cooper , Andrew Lunn , Gregory Clement , Shawn Guo , Barry Song , Tony Prisk , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Arnd Bergmann , Olof Johansson Subject: Re: [PATCH 04/20] ARM: picoxcell: Remove init_irq declaration in machine description Message-ID: <20130514162046.GA16346@page> References: <1368545933-7430-1-git-send-email-maxime.ripard@free-electrons.com> <1368545933-7430-5-git-send-email-maxime.ripard@free-electrons.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1368545933-7430-5-git-send-email-maxime.ripard@free-electrons.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQlJA7LPZr+Eai81ORvKPwr3IZSPEU/IifbBIGLXIxJhD/j5WhAMCAd3/cg3YQBOkEXhLd8W Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Hi Maxime, Thanks for this, I'll add it to my tree. I've modified it slightly to kill off the other irq includes, hopefully that's okay with you. Thanks, Jamie 8<--- From 4b83f75a7af388aaf5f79ccf72c37074bc9166da Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 14 May 2013 17:38:37 +0200 Subject: [PATCH] ARM: picoxcell: Remove init_irq declaration in machine description Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is specified") removed the need to explictly setup the init_irq field in the machine description when using only irqchip_init. Remove that declaration for picoxcell as well. [ jiles: removed other, unused irq includes. ] Signed-off-by: Maxime Ripard Signed-off-by: Jamie Iles --- arch/arm/mach-picoxcell/common.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index f6f71bb..b069fa6 100644 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c @@ -8,12 +8,8 @@ * All enquiries to support@picochip.com */ #include -#include -#include -#include #include #include -#include #include #include @@ -85,7 +81,6 @@ static void picoxcell_wdt_restart(char mode, const char *cmd) DT_MACHINE_START(PICOXCELL, "Picochip picoXcell") .map_io = picoxcell_map_io, .nr_irqs = NR_IRQS_LEGACY, - .init_irq = irqchip_init, .init_time = dw_apb_timer_init, .init_machine = picoxcell_init_machine, .dt_compat = picoxcell_dt_match,