From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932567AbcHIMiM (ORCPT ); Tue, 9 Aug 2016 08:38:12 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:38756 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932446AbcHIMiK (ORCPT ); Tue, 9 Aug 2016 08:38:10 -0400 From: Paul Burton To: , Ralf Baechle CC: Paul Burton , Greg Kroah-Hartman , Alan Stern , , Subject: [PATCH 08/20] usb: host: ehci-sead3: Remove non-DT probe code Date: Tue, 9 Aug 2016 13:35:33 +0100 Message-ID: <20160809123546.10190-9-paul.burton@imgtec.com> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160809123546.10190-1-paul.burton@imgtec.com> References: <20160809123546.10190-1-paul.burton@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.100.200.230] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the SEAD3 board is probing the EHCI controller using device tree, remove the non-DT support from the probe function. Signed-off-by: Paul Burton --- drivers/usb/host/ehci-sead3.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/usb/host/ehci-sead3.c b/drivers/usb/host/ehci-sead3.c index 05db1ae..b88ecfe 100644 --- a/drivers/usb/host/ehci-sead3.c +++ b/drivers/usb/host/ehci-sead3.c @@ -102,18 +102,10 @@ static int ehci_hcd_sead3_drv_probe(struct platform_device *pdev) if (usb_disabled()) return -ENODEV; - if (pdev->dev.of_node) { - irq = irq_of_parse_and_map(pdev->dev.of_node, 0); - if (!irq) { - dev_err(&pdev->dev, "failed to map IRQ\n"); - return -ENODEV; - } - } else { - if (pdev->resource[1].flags != IORESOURCE_IRQ) { - pr_debug("resource[1] is not IORESOURCE_IRQ"); - return -ENOMEM; - } - irq = pdev->resource[1].start; + irq = irq_of_parse_and_map(pdev->dev.of_node, 0); + if (!irq) { + dev_err(&pdev->dev, "failed to map IRQ\n"); + return -ENODEV; } hcd = usb_create_hcd(&ehci_sead3_hc_driver, &pdev->dev, "SEAD-3"); -- 2.9.2