From patchwork Fri Dec 12 15:04:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 42188 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E9ACC26C99 for ; Fri, 12 Dec 2014 15:04:48 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf1309557wib.2 for ; Fri, 12 Dec 2014 07:04:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=ZjNl8rkU563h6afq+jmmhR7Tf9nEim6BmZyGV9peznM=; b=TlyCgis14SqrvmcDVNvDQNPPXSzGDJVPX0QSdt2kL4Cgl8ng1TteCgCklaU5GPNqA3 PrkFjbWIiOjNGYx9iOXBrqLS/VEfWBr7gwhJnNSMRb1STtw2yCDHl8ahdqvRJXZrwXUl GjULT4zkKJgGgRQzLo+P9GQXL/creLE1AM0flDGtSG4HGqW+llCiGvaOl3P+zJ0rIvsL h0RTFyZFrUxkyTWlnly3d5H6Rm2VQfWxIO6kq4HCpLY6k4KKlQkZ8L8p2o5wQz4fiKVV twq1TXrLmlk6+eH/7LRtykr02vXeivO4WlrfG2dh0nUE/VhikhDn3/XH7+jgrNWgViHx UuvA== X-Gm-Message-State: ALoCoQmbtJl0nrIb1TKzMfHMn+YIOjI7cpPDsGgHo5jjyuLGSiDk3UMVApK4+k8UHMtsqM8r1MwM X-Received: by 10.181.13.147 with SMTP id ey19mr800025wid.2.1418396688261; Fri, 12 Dec 2014 07:04:48 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.116.14 with SMTP id js14ls460683lab.69.gmail; Fri, 12 Dec 2014 07:04:48 -0800 (PST) X-Received: by 10.152.5.226 with SMTP id v2mr4917570lav.34.1418396688096; Fri, 12 Dec 2014 07:04:48 -0800 (PST) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id wg10si1617714lbb.118.2014.12.12.07.04.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Dec 2014 07:04:48 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id q1so6174968lam.5 for ; Fri, 12 Dec 2014 07:04:48 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr15742694lbo.32.1418396687937; Fri, 12 Dec 2014 07:04:47 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.142.69 with SMTP id ru5csp1462lbb; Fri, 12 Dec 2014 07:04:46 -0800 (PST) X-Received: by 10.68.68.172 with SMTP id x12mr27619538pbt.71.1418396685811; Fri, 12 Dec 2014 07:04:45 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hr5si2191272pbb.241.2014.12.12.07.04.44 for ; Fri, 12 Dec 2014 07:04:45 -0800 (PST) Received-SPF: none (google.com: linux-gpio-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968108AbaLLPEo (ORCPT ); Fri, 12 Dec 2014 10:04:44 -0500 Received: from mail-wi0-f171.google.com ([209.85.212.171]:63509 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967963AbaLLPEo (ORCPT ); Fri, 12 Dec 2014 10:04:44 -0500 Received: by mail-wi0-f171.google.com with SMTP id bs8so2754752wib.16 for ; Fri, 12 Dec 2014 07:04:42 -0800 (PST) X-Received: by 10.180.75.199 with SMTP id e7mr8518591wiw.21.1418396681385; Fri, 12 Dec 2014 07:04:41 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id u9sm2130326wjy.37.2014.12.12.07.04.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Dec 2014 07:04:40 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org Cc: Alexandre Courbot , Linus Walleij , Alexander Stein Subject: [PATCH] gpio: mcp23s08: fix up compilation error Date: Fri, 12 Dec 2014 16:04:35 +0100 Message-Id: <1418396675-16959-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-gpio@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The driver depends on the chip.of_node being present to compile, which is the case on some target platforms but not others. Instead, rely on chip.dev->of_node to be used, as struct device always has an of_node in place. Cc: Alexander Stein Suggested-by: Linus Torvalds Signed-off-by: Linus Walleij --- drivers/gpio/gpio-mcp23s08.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c index 93ee7da2d8b0..da9c316059bc 100644 --- a/drivers/gpio/gpio-mcp23s08.c +++ b/drivers/gpio/gpio-mcp23s08.c @@ -655,8 +655,9 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, mcp->irq_controller = pdata->irq_controller; if (mcp->irq && mcp->irq_controller) { - mcp->irq_active_high = of_property_read_bool(mcp->chip.of_node, - "microchip,irq-active-high"); + mcp->irq_active_high = + of_property_read_bool(mcp->chip.dev->of_node, + "microchip,irq-active-high"); if (type == MCP_TYPE_017) mirror = pdata->mirror;