From patchwork Thu Nov 9 08:37:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 118398 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp6313039qgn; Thu, 9 Nov 2017 00:37:16 -0800 (PST) X-Google-Smtp-Source: ABhQp+TgPDhDDGMGt0Y/NnjUvXyyQXOyF7FBAt4g3l5j4EWOGO5x5T3VtmS937PUvBGKSMkv5kOa X-Received: by 10.101.78.10 with SMTP id r10mr3171718pgt.254.1510216636282; Thu, 09 Nov 2017 00:37:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510216636; cv=none; d=google.com; s=arc-20160816; b=cWchd1vewWzZ7EpdvhYJ8rwcwabpEfYkw+VT1BdQmiRKyn8Dm/VGEomOouoljM+nQC 3bjMVk2VNk1wR/6KBZyUaZ1IgMY0KpW2RU+XkduSxnHW3tLEgsfVXJqxMgxeQ/HPSaUR ZuRDqzdMN30CfwFFMi/bqKN2NHdqleOEPPXfun2Puu4c86EllRI3wIcDf3KaF/kGUN75 LuMoNZPj0BEqUs81uFn3Xa+Cle/lSLvi4a1FssnqoeKbKQwXNSP016Dnyo6w7D5BArOp OFAeJxpjGmWRxN/xIzq7/8DPwuBIqx2CS/U8sI650Li/Kb/azIUVp/SNoOxcX57MGIME MU3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=uQaxkKbovLVRcwn8Nvox98QmB8YyLH1GQbsDuapJyp4=; b=hv78UhFM1ob6f0GEagk9OCYc/eyoC/qioVJ0nxlQ0MBs+i0IEG3GBbWX6F9mLNZrzT YE/+Zb17i+fXov+xRTMHbVeE3i4DiVZdSmwgQHwnvZUwXFn+k29Vb+XAfZ+XkVvENP66 p4yOnivIRhvXZL+Ld+oEP/Z3D2HOGUfEAb5PmgIm9jGB/L+nC3Ltmru94Glm6+ZyZINA QMFslgb4dnBEuBGvttnO7LXsaZ9hxwrZmQo0SNKfmUDMr5BOV87gWcTILtj54LI9aIlD DMmnG2x1RRBc2QdznnXswLNQJw8dX/BP7SUDpZbg0mVI+uZBdpQbMbEST5470nCEDqrf dD1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=El3yqdvH; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k6si5610000plt.338.2017.11.09.00.37.16; Thu, 09 Nov 2017 00:37:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=El3yqdvH; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753390AbdKIIhP (ORCPT + 6 others); Thu, 9 Nov 2017 03:37:15 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:51196 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753360AbdKIIhP (ORCPT ); Thu, 9 Nov 2017 03:37:15 -0500 Received: by mail-lf0-f66.google.com with SMTP id a132so6207481lfa.7 for ; Thu, 09 Nov 2017 00:37:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=r1Dw617gGd+7/h2HAtdtOP0h+cqfgink1RZjQbBD+RE=; b=El3yqdvHd+Hs4Bb3mrWHepJFje265FIhtw8YMQ/ZIJWmX41L7TomCVkI53yhUe9nto 2uIZ3dII+SdoFtzA20Icc1FpYGpicthDn3rewhoM4VQcnp08aP5X1Nsz6kPtN3NZu0y1 h5jJMhZpqRvttL5EpIkO1iSc3Gymqo9toOHqM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=r1Dw617gGd+7/h2HAtdtOP0h+cqfgink1RZjQbBD+RE=; b=Ef5Z2vBnOFdEPt1ztXKu0rSOSFJPnUXIbpaAnFgp5ViniYP9C03g4msgKrGnH0mU25 PECSl05paZ6jOLBXuk7dgYNpzU/sngsMQ5LHe3LwUDuOfUHo5jWcpAsQKluv096+cdWx HyRlQAffQmFp2dpHGFPxPkT+jbbQ5RfEYpoNY9XieXB/Wt9AGWdyMKBUyj2j0TIGIwia gUvFppidumh6HsHDEan3Pkqaw6Ply/OID/yUu1v7cxsKF5Qk+oJMdm5ZQARUVNpomNJ6 29vRb1td9TjMLLm4Nkg9JCsYhnVz9QinyaiQF85/MuVe+t+I87N40GBs27fDvSBAQKb4 qNVQ== X-Gm-Message-State: AJaThX4gXheu6Nb9vzqN2MHWiug0u/bGrW1rOsOh+mvArogufT2noDWH 3+y1BU84NWv3Keh3jJcToU9DGL/uBvk= X-Received: by 10.25.84.134 with SMTP id b6mr1191600lfl.168.1510216633352; Thu, 09 Nov 2017 00:37:13 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id u86sm1188097lje.79.2017.11.09.00.37.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Nov 2017 00:37:12 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org Cc: Linus Walleij , Thierry Reding Subject: [PATCH] pinctrl: bcm2835: Fix some merge fallout Date: Thu, 9 Nov 2017 09:37:10 +0100 Message-Id: <20171109083710.3567-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.13.6 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Fixing a small merge problem in BCM2835 related to the new irqchip code. Cc: Thierry Reding Signed-off-by: Linus Walleij --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.6 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Thierry Reding diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index fb85ab3cf662..72d122748293 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -383,7 +383,7 @@ static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc, /* FIXME: no clue why the code looks up the type here */ type = pc->irq_type[gpio]; - generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.irqdomain, + generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain, gpio)); } }