From patchwork Tue Dec 15 13:43:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 58443 Delivered-To: patch@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp45996lbb; Tue, 15 Dec 2015 05:43:41 -0800 (PST) X-Received: by 10.98.31.197 with SMTP id l66mr14894710pfj.128.1450187021123; Tue, 15 Dec 2015 05:43:41 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tq1si2010462pac.125.2015.12.15.05.43.40; Tue, 15 Dec 2015 05:43:41 -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; 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; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933433AbbLONnk (ORCPT + 4 others); Tue, 15 Dec 2015 08:43:40 -0500 Received: from mail-lf0-f51.google.com ([209.85.215.51]:35655 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932487AbbLONn1 (ORCPT ); Tue, 15 Dec 2015 08:43:27 -0500 Received: by mail-lf0-f51.google.com with SMTP id l133so6680161lfd.2 for ; Tue, 15 Dec 2015 05:43:26 -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=X1E9jxGYmNGgY9hJHIlvLvfxuhEow35ZzxKh0RASvbw=; b=ey+EYbVoY7WsWXXxx7R8XWiep1+zsImT44J3efE058q6kGjuKFVHldbNxOLKe/Hf9c dNQbOcXXBf+XupgNySTKg1orEZ9cvN+Va6chk9honK01d+wk4907hdhey8A0HsNy40UY Oq+qJqfzMlAvLCfwGomzJ7k3cwUfPibDOr+f8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=X1E9jxGYmNGgY9hJHIlvLvfxuhEow35ZzxKh0RASvbw=; b=fxyEnBTEZh6ETv/O0B/LZaVp/loCZhpSB8UJlM+ycQBgUGVgJ25Edn79F5rnaTqC8a T3+R3q+mHltYRaxRKGt+ZbrYPS+AzWX8ouNgq77J6gVlKZd8Qp6lr+WGBfe2mjw3/E3j tqFOxQekm/XIOqxUOPUcUxWxfu/drfGjKFHrF0LlnES1t4ArALyzLoYqGhwWFWtH8oaP zgGfkztjK6WLKvws+D3Jj+iH73T4+njafPn4IdOaJEdY2+WFAHPFGpOvskBoyPjkLoOU pxqmQUL8gHoBk/NrWaugmv6kxINTYp64Af6MuGd/C8e+N5yv+5W6nDLJZ/7k/tcYvqah xFJw== X-Gm-Message-State: ALoCoQnuGmfL0hi19c4fepCSnRsRdPdz+xds9znH5aQv9bas5BtyyGJFhvHPj/ZmPyP/Q6HmkLhqmtUPKhT16RsQCyrqN+4Dcg== X-Received: by 10.25.84.144 with SMTP id i138mr5990337lfb.137.1450187005590; Tue, 15 Dec 2015 05:43:25 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id pf5sm227622lbc.19.2015.12.15.05.43.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Dec 2015 05:43:24 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org, Alexandre Courbot Cc: Linus Walleij , Paul Burton Subject: [PATCH] gpio: pch: fix non-DT build Date: Tue, 15 Dec 2015 14:43:22 +0100 Message-Id: <1450187002-25804-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org commit 1cfadea8f395e3fb6a15ea548e3e86c8b6d64f98 "gpio: pch: allow use from device tree" makes the driver not compile unless CONFIG_OF_GPIO is set. Fix it. Cc: Paul Burton Signed-off-by: Linus Walleij --- drivers/gpio/gpio-pch.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.4.3 -- 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 diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c index a650a6cc1312..af0715f8524b 100644 --- a/drivers/gpio/gpio-pch.c +++ b/drivers/gpio/gpio-pch.c @@ -394,7 +394,9 @@ static int pch_gpio_probe(struct pci_dev *pdev, pci_set_drvdata(pdev, chip); spin_lock_init(&chip->spinlock); pch_gpio_setup(chip); +#ifdef CONFIG_OF_GPIO chip->gpio.of_node = pdev->dev.of_node; +#endif ret = gpiochip_add(&chip->gpio); if (ret) { dev_err(&pdev->dev, "PCH gpio: Failed to register GPIO\n");