From patchwork Tue Nov 17 15:42:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 38652 X-Patchwork-Delegate: grant.likely@secretlab.ca Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 3ADAC101C4B for ; Wed, 18 Nov 2009 02:43:36 +1100 (EST) Received: by ozlabs.org (Postfix) id 8AB47B7DE7; Wed, 18 Nov 2009 02:42:46 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.154]) by ozlabs.org (Postfix) with ESMTP id C97E7B7D9C for ; Wed, 18 Nov 2009 02:42:45 +1100 (EST) Received: by fg-out-1718.google.com with SMTP id d23so1587822fga.3 for ; Tue, 17 Nov 2009 07:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=F77Dbh3DmDArR6iRiwktUOFzyZ/pkDudyqi8HjBbVPY=; b=WTRaZFagvyaf/nUQJkas0Tx7MY1B1vEShjEnnkzyMZhbZWDnaclcDyLAiIy22qvxC3 kAu1jsPsbsmrigIeMEcATJoGmNKje+t7PWd3Gpx6IrYn7Mt3HngaJCaJqmB87pGSV8pf fKuuUG/6vPhqDQvL1tSfxDEp7O/Veb2wbNUOA= 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=Sym0iR5MYhk/O0BBfENtBeUNCrqeQtXE8nJAtxDAi5uEeYaBKO4Lz7N0mJ3yOb7Oxs XcEbERbQSDennMZ4fMFfodT6YAx4ddOAfKFH3fuM9hig9IDXiX24KyzgKoJOgF3rGpsZ Jzj4scrwY0KsuvKjpZEetvxvsYi0rlfqwntMk= Received: by 10.86.14.8 with SMTP id 8mr151043fgn.28.1258472563931; Tue, 17 Nov 2009 07:42:43 -0800 (PST) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id e11sm1446370fga.2.2009.11.17.07.42.41 (version=SSLv3 cipher=RC4-MD5); Tue, 17 Nov 2009 07:42:42 -0800 (PST) From: Dmitry Eremin-Solenikov To: devicetree-discuss@lists.ozlabs.org, linuxppc-dev@ozlabs.org Subject: [RFC PATCH 5/5] qe_gpio: port to new of gpio interface Date: Tue, 17 Nov 2009 18:42:26 +0300 Message-Id: <1258472546-31343-6-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.6.5 In-Reply-To: <1258472546-31343-1-git-send-email-dbaryshkov@gmail.com> References: <1258472546-31343-1-git-send-email-dbaryshkov@gmail.com> Cc: David Brownell , Paul Mackerras X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Signed-off-by: Dmitry Eremin-Solenikov --- arch/powerpc/sysdev/qe_lib/gpio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/sysdev/qe_lib/gpio.c b/arch/powerpc/sysdev/qe_lib/gpio.c index 8e7a776..b85eab8 100644 --- a/arch/powerpc/sysdev/qe_lib/gpio.c +++ b/arch/powerpc/sysdev/qe_lib/gpio.c @@ -187,7 +187,7 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index) if (err < 0) goto err1; - mm_gc = to_of_mm_gpio_chip(&of_gc->gc); + mm_gc = to_of_mm_of_chip(of_gc); qe_gc = to_qe_gpio_chip(mm_gc); spin_lock_irqsave(&qe_gc->lock, flags); @@ -319,7 +319,7 @@ static int __init qe_add_gpiochips(void) mm_gc = &qe_gc->mm_gc; of_gc = &mm_gc->of_gc; - gc = &of_gc->gc; + gc = &mm_gc->gc; mm_gc->save_regs = qe_gpio_save_regs; of_gc->gpio_cells = 2;