From patchwork Mon Apr 18 19:21:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 716341 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3IJLoA0019654 for ; Mon, 18 Apr 2011 19:21:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756552Ab1DRTVs (ORCPT ); Mon, 18 Apr 2011 15:21:48 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:61034 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756523Ab1DRTVs (ORCPT ); Mon, 18 Apr 2011 15:21:48 -0400 Received: by mail-ew0-f46.google.com with SMTP id 4so1481820ewy.19 for ; Mon, 18 Apr 2011 12:21:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=3KIS5Rd44/OE/VOWWa4xpnhnT+SGKNLMX24v9KRUyS8=; b=c7oKd07eJ4phfulxpAqLBiFKnxI3xa2czVU4cCdmOAU/NTHDruK2LOk/0tW+uSMZ9K k1sLTlZKV1SudjA4scMO6j7SszsgQyf1dXl0cb7aboh+ahNpji2j5nmFFJxLslEK3MIR Z/y0nnmj9QIrGuEaro7C5ky7RPYmUeQFhfId4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=mMLYrqres9mW0E2LFHOetMuoAGZvNexVC0gao0MdT6jdEzDOgK0bdOp1rx1Xgwgm7X Qv6ZegRJVHAUCo4PWb0yOViyL9IbNqSrSalvxH6PnuV5WP5BMEyGQabFnWg2fR81gaws ztKJtf8Kz9dn0Nnd0g0nRQ6qkmLiBOxTwibhY= Received: by 10.213.110.18 with SMTP id l18mr3791201ebp.57.1303154507450; Mon, 18 Apr 2011 12:21:47 -0700 (PDT) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id q53sm4297160eeh.11.2011.04.18.12.21.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Apr 2011 12:21:46 -0700 (PDT) From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: Tony Lindgren , Felipe Balbi , Jarkko Nikula Subject: [PATCH 2/3] cbus: retu: Fix build breakage caused by recent genirq commits Date: Mon, 18 Apr 2011 22:21:31 +0300 Message-Id: <1303154492-13520-2-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1303154492-13520-1-git-send-email-jhnikula@gmail.com> References: <1303154492-13520-1-git-send-email-jhnikula@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Apr 2011 19:21:50 +0000 (UTC) Convert retu.c to use updated irq function names after the genirq cleanup commits 0c6f8a8 "genirq: Remove compat code" and a0cd9ca "genirq: Namespace cleanup". Signed-off-by: Jarkko Nikula --- drivers/cbus/retu.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/cbus/retu.c b/drivers/cbus/retu.c index f271e57..ec108f3 100644 --- a/drivers/cbus/retu.c +++ b/drivers/cbus/retu.c @@ -298,10 +298,10 @@ static void retu_irq_init(struct retu *retu) int irq; for (irq = base; irq < end; irq++) { - set_irq_chip_data(irq, retu); - set_irq_chip_and_handler(irq, &retu_irq_chip, + irq_set_chip_data(irq, retu); + irq_set_chip_and_handler(irq, &retu_irq_chip, handle_simple_irq); - set_irq_nested_thread(irq, 1); + irq_set_nested_thread(irq, 1); retu_irq_setup(irq); } } @@ -316,8 +316,8 @@ static void retu_irq_exit(struct retu *retu) #ifdef CONFIG_ARM set_irq_flags(irq, 0); #endif - set_irq_chip_and_handler(irq, NULL, NULL); - set_irq_chip_data(irq, NULL); + irq_set_chip_and_handler(irq, NULL, NULL); + irq_set_chip_data(irq, NULL); } } @@ -479,7 +479,7 @@ static int __init retu_probe(struct platform_device *pdev) goto err1; } - set_irq_wake(retu->irq, 1); + irq_set_irq_wake(retu->irq, 1); /* Register power off function */ pm_power_off = retu_power_off;