From patchwork Thu Jan 4 22:45:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 123460 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp80732qgn; Thu, 4 Jan 2018 14:46:16 -0800 (PST) X-Google-Smtp-Source: ACJfBosxmXKF9ssE9K96XjtJZbzS2RIOb1WySh7Jc7BI/n4yYf9A1yB+oKg8TkaTY8dDcTwTewHc X-Received: by 10.99.106.138 with SMTP id f132mr833982pgc.211.1515105976045; Thu, 04 Jan 2018 14:46:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515105976; cv=none; d=google.com; s=arc-20160816; b=YYfa6RuTiBugvs1TF+Tm+upS0R1CnQk5OZcOvzs39czmv4bLdyVuUoz/S2b54ZZko1 EIZg+/hOcrRyRgVg63e5Mo7R+3RNyxl0XfuRENC4DR+4iFr3UtjkqEYIppsomNZamdjY /M0XLAhDeXVUYrvETQ7I7QqBtQBOi7UBvc7nIeQ4C/MBXQihRfIzVc4rHPFbLb0etmo6 oKGFNLZ0pc6v1AGJi5Hp4GWTh/3cW4+YU8KHujzCMoYwRm+Z5MzM1dT6y/7DJ61HWmhB iQasYNHmh2tTNrFjE/2lmtqKNma2JIhc02ksGs1ewbHBD+3Zmo7A+YlEuE4YcvBJUWCg QjaQ== 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 :arc-authentication-results; bh=nuhN+OJYMR7OTOgN539vcJ4z3lh+hthXnjyo3lBvh4E=; b=Y2FOU8n4Z0L+ROfdlaBNesOS28kwlfPDLD6zo3s8R/VFiorRvVPI2F3VULjTZZAaKo VqYwFsLo7AtHkrxvHp0NSw1WoXvWcJtMVLyY9nnP9P049qL9Id7DMj4BswEkAVpa/sEP tssNAipNOvyM84JALopyYtC1xz38HFPs7JkZ+O3x3x/38kXSGbhuiM+YdsLMjHwQV4ov rVzUPu35V2nJaWaHOQX+KH6ASIZzvwBISkl653WReQtl+JbWXnS+vsWHrBf7xFxCjrug Xp+NY0YvZ2197UxQKZI85LLnXc+SL9a5tyOpWHiNcVCAjUSu6p0Yc6WHg2jt0UXi/aK3 5Xew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r26si3008359pfk.249.2018.01.04.14.46.15; Thu, 04 Jan 2018 14:46:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753603AbeADWpp (ORCPT + 10 others); Thu, 4 Jan 2018 17:45:45 -0500 Received: from mail-oi0-f65.google.com ([209.85.218.65]:38391 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753573AbeADWpn (ORCPT ); Thu, 4 Jan 2018 17:45:43 -0500 Received: by mail-oi0-f65.google.com with SMTP id r65so2037961oie.5 for ; Thu, 04 Jan 2018 14:45:43 -0800 (PST) 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=nuhN+OJYMR7OTOgN539vcJ4z3lh+hthXnjyo3lBvh4E=; b=Cy72B6rkm8QsN4twrISnFafzO/2U58pVP1rGijVvUUUyUs85KIMq2LUd5WlMtgoIcK M+2kmMSjwZOsA48Tzek2ujwZfTVSmgbeOVU7koYJrckLb9ag4M3DGMtLYWrlNdFahF1o eGEd2deAynChn9X2kARkttOdT7tWppWN4FfTu5BCqsPwugHnfX+5CCSd2RrSQRRX7GuL oVs5UjX5A6pylknFZiiv9DuYe7dChtlTQvc9O4BTrZXk1EDXZiD818paWApDkNlXCiRf J/la/WqVEMFVTk7Mbqn+OJdfzzHJ3ehztmtX2sVtmuG4XO1QoR1ciOuDadn5V6fHXL4X oFwg== X-Gm-Message-State: AKGB3mI0xVQ73JzFlDuZuDqb19eJ3fHDzSWXOLtcfaUG7SbpIFfKsTkm oMhsBRyTzSYrAAo7c0hUbA== X-Received: by 10.202.252.67 with SMTP id a64mr633533oii.301.1515105943405; Thu, 04 Jan 2018 14:45:43 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id s63sm1704516oie.41.2018.01.04.14.45.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 14:45:42 -0800 (PST) From: Rob Herring To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Eli Billauer Subject: [PATCH] char: xillybus: remove direct dependency on DT functions Date: Thu, 4 Jan 2018 16:45:39 -0600 Message-Id: <20180104224542.15333-1-robh@kernel.org> X-Mailer: git-send-email 2.14.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Drivers generally should not need to depend directly on OF_ADDRESS or OF_IRQ. Convert xillybus to use the preferred platform_get_resource() and platform_get_irq() functions to remove this dependency. Cc: Eli Billauer Cc: Greg Kroah-Hartman Signed-off-by: Rob Herring --- drivers/char/xillybus/Kconfig | 4 ++-- drivers/char/xillybus/xillybus_of.c | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) -- 2.14.1 diff --git a/drivers/char/xillybus/Kconfig b/drivers/char/xillybus/Kconfig index b302684d86c1..a1f16df08d32 100644 --- a/drivers/char/xillybus/Kconfig +++ b/drivers/char/xillybus/Kconfig @@ -4,7 +4,7 @@ config XILLYBUS tristate "Xillybus generic FPGA interface" - depends on PCI || (OF_ADDRESS && OF_IRQ) + depends on PCI || OF select CRC32 help Xillybus is a generic interface for peripherals designed on @@ -24,7 +24,7 @@ config XILLYBUS_PCIE config XILLYBUS_OF tristate "Xillybus over Device Tree" - depends on OF_ADDRESS && OF_IRQ && HAS_DMA + depends on OF && HAS_DMA help Set to M if you want Xillybus to find its resources from the Open Firmware Flattened Device Tree. If the target is an embedded diff --git a/drivers/char/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c index 78a492f5acfb..4d6625ccb48f 100644 --- a/drivers/char/xillybus/xillybus_of.c +++ b/drivers/char/xillybus/xillybus_of.c @@ -15,10 +15,6 @@ #include #include #include -#include -#include -#include -#include #include #include "xillybus.h" @@ -123,7 +119,7 @@ static int xilly_drv_probe(struct platform_device *op) struct xilly_endpoint *endpoint; int rc; int irq; - struct resource res; + struct resource *res; struct xilly_endpoint_hardware *ephw = &of_hw; if (of_property_read_bool(dev->of_node, "dma-coherent")) @@ -136,13 +132,13 @@ static int xilly_drv_probe(struct platform_device *op) dev_set_drvdata(dev, endpoint); - rc = of_address_to_resource(dev->of_node, 0, &res); - endpoint->registers = devm_ioremap_resource(dev, &res); + res = platform_get_resource(op, IORESOURCE_MEM, 0); + endpoint->registers = devm_ioremap_resource(dev, res); if (IS_ERR(endpoint->registers)) return PTR_ERR(endpoint->registers); - irq = irq_of_parse_and_map(dev->of_node, 0); + irq = platform_get_irq(op, 0); rc = devm_request_irq(dev, irq, xillybus_isr, 0, xillyname, endpoint);