From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,6/8] ARM: davinci: omapl138-hawk: remove legacy usb helpers From: Bartosz Golaszewski Message-Id: <20190211103702.4277-7-brgl@bgdev.pl> Date: Mon, 11 Feb 2019 11:37:00 +0100 To: Sekhar Nori , Kevin Hilman , Alan Stern , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Linus Walleij , Bartosz Golaszewski List-ID: RnJvbTogQmFydG9zeiBHb2xhc3pld3NraSA8YmdvbGFzemV3c2tpQGJheWxpYnJlLmNvbT4KClRo ZSBsb2dpYyBpbXBsZW1lbnRlZCBieSB0aGVzZSByb3V0aW5lcyBub3cgbGl2ZXMgaW4gdGhlIGRh OHh4LW9oY2kKZHJpdmVyLiBSZW1vdmUgZGVhZCBjb2RlLgoKU2lnbmVkLW9mZi1ieTogQmFydG9z eiBHb2xhc3pld3NraSA8YmdvbGFzemV3c2tpQGJheWxpYnJlLmNvbT4KLS0tCiBhcmNoL2FybS9t YWNoLWRhdmluY2kvYm9hcmQtb21hcGwxMzgtaGF3ay5jIHwgNzUgKy0tLS0tLS0tLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDc0IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1vbWFwbDEzOC1oYXdrLmMgYi9h cmNoL2FybS9tYWNoLWRhdmluY2kvYm9hcmQtb21hcGwxMzgtaGF3ay5jCmluZGV4IDg1NmM1NzA3 YmFlOS4uODhhMGM2MmVlZTg2IDEwMDY0NAotLS0gYS9hcmNoL2FybS9tYWNoLWRhdmluY2kvYm9h cmQtb21hcGwxMzgtaGF3ay5jCisrKyBiL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1vbWFw bDEzOC1oYXdrLmMKQEAgLTI5NCw5ICsyOTQsNiBAQCBzdGF0aWMgaW50IG9tYXBsMTM4X2hhd2tf cmVnaXN0ZXJfYWVtaWYodm9pZCkKIAlyZXR1cm4gcGxhdGZvcm1fZGV2aWNlX3JlZ2lzdGVyKCZv bWFwbDEzOF9oYXdrX2FlbWlmX2RldmljZSk7CiB9CiAKLXN0YXRpYyBpcnFyZXR1cm5fdCBvbWFw bDEzOF9oYXdrX3VzYl9vY2ljX2lycShpbnQgaXJxLCB2b2lkICpkZXZfaWQpOwotc3RhdGljIGRh OHh4X29jaWNfaGFuZGxlcl90IGhhd2tfdXNiX29jaWNfaGFuZGxlcjsKLQogc3RhdGljIGNvbnN0 IHNob3J0IGRhODUwX2hhd2tfdXNiMTFfcGluc1tdID0gewogCURBODUwX0dQSU8yXzQsIERBODUw X0dQSU82XzEzLAogCS0xCkBAIC0zMTAsNTggKzMwNywxMSBAQCBzdGF0aWMgc3RydWN0IGdwaW9k X2xvb2t1cF90YWJsZSBoYXdrX3VzYl9ncGlvX2xvb2t1cCA9IHsKIAl9LAogfTsKIAotc3RhdGlj IGludCBoYXdrX3VzYl9zZXRfcG93ZXIodW5zaWduZWQgcG9ydCwgaW50IG9uKQotewotCWdwaW9f c2V0X3ZhbHVlKERBODUwX1VTQjFfVkJVU19QSU4sIG9uKTsKLQlyZXR1cm4gMDsKLX0KLQotc3Rh dGljIGludCBoYXdrX3VzYl9nZXRfcG93ZXIodW5zaWduZWQgcG9ydCkKLXsKLQlyZXR1cm4gZ3Bp b19nZXRfdmFsdWUoREE4NTBfVVNCMV9WQlVTX1BJTik7Ci19Ci0KLXN0YXRpYyBpbnQgaGF3a191 c2JfZ2V0X29jaSh1bnNpZ25lZCBwb3J0KQotewotCXJldHVybiAhZ3Bpb19nZXRfdmFsdWUoREE4 NTBfVVNCMV9PQ19QSU4pOwotfQotCi1zdGF0aWMgaW50IGhhd2tfdXNiX29jaWNfbm90aWZ5KGRh OHh4X29jaWNfaGFuZGxlcl90IGhhbmRsZXIpCi17Ci0JaW50IGlycSAgICAgICAgID0gZ3Bpb190 b19pcnEoREE4NTBfVVNCMV9PQ19QSU4pOwotCWludCBlcnJvciAgICAgICA9IDA7Ci0KLQlpZiAo aGFuZGxlciAhPSBOVUxMKSB7Ci0JCWhhd2tfdXNiX29jaWNfaGFuZGxlciA9IGhhbmRsZXI7Ci0K LQkJZXJyb3IgPSByZXF1ZXN0X2lycShpcnEsIG9tYXBsMTM4X2hhd2tfdXNiX29jaWNfaXJxLAot CQkJCQlJUlFGX1RSSUdHRVJfUklTSU5HIHwKLQkJCQkJSVJRRl9UUklHR0VSX0ZBTExJTkcsCi0J CQkJCSJPSENJIG92ZXItY3VycmVudCBpbmRpY2F0b3IiLCBOVUxMKTsKLQkJaWYgKGVycm9yKQot CQkJcHJfZXJyKCIlczogY291bGQgbm90IHJlcXVlc3QgSVJRIHRvIHdhdGNoICIKLQkJCQkib3Zl ci1jdXJyZW50IGluZGljYXRvciBjaGFuZ2VzXG4iLCBfX2Z1bmNfXyk7Ci0JfSBlbHNlIHsKLQkJ ZnJlZV9pcnEoaXJxLCBOVUxMKTsKLQl9Ci0JcmV0dXJuIGVycm9yOwotfQotCiBzdGF0aWMgc3Ry dWN0IGRhOHh4X29oY2lfcm9vdF9odWIgb21hcGwxMzhfaGF3a191c2IxMV9wZGF0YSA9IHsKLQku c2V0X3Bvd2VyICAgICAgPSBoYXdrX3VzYl9zZXRfcG93ZXIsCi0JLmdldF9wb3dlciAgICAgID0g aGF3a191c2JfZ2V0X3Bvd2VyLAotCS5nZXRfb2NpICAgICAgICA9IGhhd2tfdXNiX2dldF9vY2ks Ci0JLm9jaWNfbm90aWZ5ICAgID0gaGF3a191c2Jfb2NpY19ub3RpZnksCiAJLyogVFBTMjA4NyBz d2l0Y2ggQCA1ViAqLwogCS5wb3RwZ3QgICAgICAgICA9ICgzICsgMSkgLyAyLCAgLyogMyBtcyBt YXggKi8KIH07CiAKLXN0YXRpYyBpcnFyZXR1cm5fdCBvbWFwbDEzOF9oYXdrX3VzYl9vY2ljX2ly cShpbnQgaXJxLCB2b2lkICpkZXZfaWQpCi17Ci0JaGF3a191c2Jfb2NpY19oYW5kbGVyKCZvbWFw bDEzOF9oYXdrX3VzYjExX3BkYXRhLCAxKTsKLQlyZXR1cm4gSVJRX0hBTkRMRUQ7Ci19Ci0KIHN0 YXRpYyBfX2luaXQgdm9pZCBvbWFwbDEzOF9oYXdrX3VzYl9pbml0KHZvaWQpCiB7CiAJaW50IHJl dDsKQEAgLTM4MiwzNiArMzMyLDEzIEBAIHN0YXRpYyBfX2luaXQgdm9pZCBvbWFwbDEzOF9oYXdr X3VzYl9pbml0KHZvaWQpCiAJCXByX3dhcm4oIiVzOiBVU0IgUEhZIHJlZ2lzdHJhdGlvbiBmYWls ZWQ6ICVkXG4iLAogCQkJX19mdW5jX18sIHJldCk7CiAKLQlyZXQgPSBncGlvX3JlcXVlc3Rfb25l KERBODUwX1VTQjFfVkJVU19QSU4sCi0JCQlHUElPRl9ESVJfT1VULCAiVVNCMSBWQlVTIik7Ci0J aWYgKHJldCA8IDApIHsKLQkJcHJfZXJyKCIlczogZmFpbGVkIHRvIHJlcXVlc3QgR1BJTyBmb3Ig VVNCIDEuMSBwb3J0ICIKLQkJCSJwb3dlciBjb250cm9sOiAlZFxuIiwgX19mdW5jX18sIHJldCk7 Ci0JCXJldHVybjsKLQl9Ci0KLQlyZXQgPSBncGlvX3JlcXVlc3Rfb25lKERBODUwX1VTQjFfT0Nf UElOLAotCQkJR1BJT0ZfRElSX0lOLCAiVVNCMSBPQyIpOwotCWlmIChyZXQgPCAwKSB7Ci0JCXBy X2VycigiJXM6IGZhaWxlZCB0byByZXF1ZXN0IEdQSU8gZm9yIFVTQiAxLjEgcG9ydCAiCi0JCQki b3Zlci1jdXJyZW50IGluZGljYXRvcjogJWRcbiIsIF9fZnVuY19fLCByZXQpOwotCQlnb3RvIHVz YjExX3NldHVwX29jX2ZhaWw7Ci0JfQotCiAJZ3Bpb2RfYWRkX2xvb2t1cF90YWJsZSgmaGF3a191 c2JfZ3Bpb19sb29rdXApOwogCiAJcmV0ID0gZGE4eHhfcmVnaXN0ZXJfdXNiMTEoJm9tYXBsMTM4 X2hhd2tfdXNiMTFfcGRhdGEpOwotCWlmIChyZXQpIHsKKwlpZiAocmV0KQogCQlwcl93YXJuKCIl czogVVNCIDEuMSByZWdpc3RyYXRpb24gZmFpbGVkOiAlZFxuIiwgX19mdW5jX18sIHJldCk7Ci0J CWdvdG8gdXNiMTFfc2V0dXBfZmFpbDsKLQl9CiAKIAlyZXR1cm47Ci0KLXVzYjExX3NldHVwX2Zh aWw6Ci0JZ3Bpb19mcmVlKERBODUwX1VTQjFfT0NfUElOKTsKLXVzYjExX3NldHVwX29jX2ZhaWw6 Ci0JZ3Bpb19mcmVlKERBODUwX1VTQjFfVkJVU19QSU4pOwogfQogCiBzdGF0aWMgX19pbml0IHZv aWQgb21hcGwxMzhfaGF3a19pbml0KHZvaWQpCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B277C169C4 for ; Mon, 11 Feb 2019 10:39:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D99D52084D for ; Mon, 11 Feb 2019 10:39:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tqRHOSqM"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="zQKAKx5z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D99D52084D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hvGNndEU9S6ErmU/hKl3EcMaOpr9WcHGEJHlcdxm8HU=; b=tqRHOSqMo47bw9 fC/TRleIM5OsCbOzJm1ZBb/CSkYpI/Nswo5+h/n0U7OIjaSMx8pdVM6IXxOcKkNpBQml05019WeJW 6JPre+ycF5VDarhnGzATagw5Ofhi5iv6IZXVnf4HmxPZuLsX7SPdwFp+C4Y64P3qSEPIabqi8cdrC WgcKLfsEIA7YGR7sgVEs7oRxM+rrJz7GxBf1e3Gq6Xk0ksuBrO5L/OHtq0dYUzbuYt4XoA+9zGAMj oqrqZ61ieNd4QRXaesyhPEVsznRlIR8wiJ41gB04F5UxtwE1Ik4gVgCpup71xZZFUlIDJANHDC8Fh TqLJSXuZaKeK9HRowH7A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gt8zf-0008Rr-Ef; Mon, 11 Feb 2019 10:39:19 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gt8xe-0006cq-Vc for linux-arm-kernel@lists.infradead.org; Mon, 11 Feb 2019 10:37:20 +0000 Received: by mail-wm1-x343.google.com with SMTP id a62so16790118wmh.4 for ; Mon, 11 Feb 2019 02:37:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z56W91f7fqmIDFSLo4iJF9+SrfI/T8Kx4jtFNkkkjzw=; b=zQKAKx5zLCaIyJYe1hm0ICz57RS4juItNm7pQ+l/pKGcHfA1cpzsoH3JBO1gnbYz97 ovcETZOVvWT1Ccyquku63LHG1Zl7Yx0Spu/YIvcsG6xLO2r+2EMkoT9jzhhHFxqQMehJ JlVFhEo30R/dyUhqD1G+TAfZVlqmtm1nFJVk/2gSRUfo7FtHmbLo7gJdRHWeWfBjdmPm DPciAVRXifK7o6PsRe/LMbjWr65/Fu5dlVj27bBJuuEgDrCUXEn4vTowoFcNNNhdSptw DNqOAUqVqJ5zJtRJIcXTQPP6YaI9zHt3Eo0bxN/+92N3CQJ9eRNi5etVO3f2VqnSnMnl LS9w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z56W91f7fqmIDFSLo4iJF9+SrfI/T8Kx4jtFNkkkjzw=; b=k/FXkqZXRHfm396M8j1Y9A7xhZiNqTq1syEAe9Z8rFW9ttbw7yMj6/NaHjcdnc6YSv Hqpm/+YIz857ZqUq807Fq6FQvskwFpq9odVZz3HlDf+TaUeeqDFoGgtdtCyCe4OinZi2 DnfPAagLCMRZp1StOWJwc3u/gYV1hnaN4LzE0AvTx5pdY8B6MUmfC2HucXQ3nbOyXclF nZHBtFOznpCcka4uNnENevOsRf8hA359Wi3PK6JyjO1JGmwyikGJlOfqgKpprfRXNn6R tzUuZ3SC1UywCeNB2v69bteeQxPQ6oXvFevd0eTxJ790lcFGYZ3wxmUGpnmtbZCPrYgn pu/g== X-Gm-Message-State: AHQUAubJpg5UTJ4aoCynaUPzsG8gsvm8hWNIGjfNtgrV5g234EzYYIfc Y19ve0d5A8WRD4QRbOiCgYAd/g== X-Google-Smtp-Source: AHgI3IaqtZZIN/H9RqZ5gAnvMDY+UmAo0KBTaI2NvxnknK+IG282wnQAzpD+m61G25BbXjxFwbvBwg== X-Received: by 2002:a7b:c764:: with SMTP id x4mr7468234wmk.47.1549881433564; Mon, 11 Feb 2019 02:37:13 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id i192sm11121275wmg.7.2019.02.11.02.37.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Feb 2019 02:37:12 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Alan Stern , Greg Kroah-Hartman Subject: [PATCH v2 6/8] ARM: davinci: omapl138-hawk: remove legacy usb helpers Date: Mon, 11 Feb 2019 11:37:00 +0100 Message-Id: <20190211103702.4277-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211103702.4277-1-brgl@bgdev.pl> References: <20190211103702.4277-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190211_023715_317847_B592745F X-CRM114-Status: GOOD ( 15.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , Linus Walleij , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Bartosz Golaszewski The logic implemented by these routines now lives in the da8xx-ohci driver. Remove dead code. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/board-omapl138-hawk.c | 75 +-------------------- 1 file changed, 1 insertion(+), 74 deletions(-) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 856c5707bae9..88a0c62eee86 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -294,9 +294,6 @@ static int omapl138_hawk_register_aemif(void) return platform_device_register(&omapl138_hawk_aemif_device); } -static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id); -static da8xx_ocic_handler_t hawk_usb_ocic_handler; - static const short da850_hawk_usb11_pins[] = { DA850_GPIO2_4, DA850_GPIO6_13, -1 @@ -310,58 +307,11 @@ static struct gpiod_lookup_table hawk_usb_gpio_lookup = { }, }; -static int hawk_usb_set_power(unsigned port, int on) -{ - gpio_set_value(DA850_USB1_VBUS_PIN, on); - return 0; -} - -static int hawk_usb_get_power(unsigned port) -{ - return gpio_get_value(DA850_USB1_VBUS_PIN); -} - -static int hawk_usb_get_oci(unsigned port) -{ - return !gpio_get_value(DA850_USB1_OC_PIN); -} - -static int hawk_usb_ocic_notify(da8xx_ocic_handler_t handler) -{ - int irq = gpio_to_irq(DA850_USB1_OC_PIN); - int error = 0; - - if (handler != NULL) { - hawk_usb_ocic_handler = handler; - - error = request_irq(irq, omapl138_hawk_usb_ocic_irq, - IRQF_TRIGGER_RISING | - IRQF_TRIGGER_FALLING, - "OHCI over-current indicator", NULL); - if (error) - pr_err("%s: could not request IRQ to watch " - "over-current indicator changes\n", __func__); - } else { - free_irq(irq, NULL); - } - return error; -} - static struct da8xx_ohci_root_hub omapl138_hawk_usb11_pdata = { - .set_power = hawk_usb_set_power, - .get_power = hawk_usb_get_power, - .get_oci = hawk_usb_get_oci, - .ocic_notify = hawk_usb_ocic_notify, /* TPS2087 switch @ 5V */ .potpgt = (3 + 1) / 2, /* 3 ms max */ }; -static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id) -{ - hawk_usb_ocic_handler(&omapl138_hawk_usb11_pdata, 1); - return IRQ_HANDLED; -} - static __init void omapl138_hawk_usb_init(void) { int ret; @@ -382,36 +332,13 @@ static __init void omapl138_hawk_usb_init(void) pr_warn("%s: USB PHY registration failed: %d\n", __func__, ret); - ret = gpio_request_one(DA850_USB1_VBUS_PIN, - GPIOF_DIR_OUT, "USB1 VBUS"); - if (ret < 0) { - pr_err("%s: failed to request GPIO for USB 1.1 port " - "power control: %d\n", __func__, ret); - return; - } - - ret = gpio_request_one(DA850_USB1_OC_PIN, - GPIOF_DIR_IN, "USB1 OC"); - if (ret < 0) { - pr_err("%s: failed to request GPIO for USB 1.1 port " - "over-current indicator: %d\n", __func__, ret); - goto usb11_setup_oc_fail; - } - gpiod_add_lookup_table(&hawk_usb_gpio_lookup); ret = da8xx_register_usb11(&omapl138_hawk_usb11_pdata); - if (ret) { + if (ret) pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret); - goto usb11_setup_fail; - } return; - -usb11_setup_fail: - gpio_free(DA850_USB1_OC_PIN); -usb11_setup_oc_fail: - gpio_free(DA850_USB1_VBUS_PIN); } static __init void omapl138_hawk_init(void) -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67435C282D7 for ; Mon, 11 Feb 2019 10:37:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3487F2084D for ; Mon, 11 Feb 2019 10:37:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="zQKAKx5z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727137AbfBKKhk (ORCPT ); Mon, 11 Feb 2019 05:37:40 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50830 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726961AbfBKKhP (ORCPT ); Mon, 11 Feb 2019 05:37:15 -0500 Received: by mail-wm1-f68.google.com with SMTP id x7so891175wmj.0 for ; Mon, 11 Feb 2019 02:37:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z56W91f7fqmIDFSLo4iJF9+SrfI/T8Kx4jtFNkkkjzw=; b=zQKAKx5zLCaIyJYe1hm0ICz57RS4juItNm7pQ+l/pKGcHfA1cpzsoH3JBO1gnbYz97 ovcETZOVvWT1Ccyquku63LHG1Zl7Yx0Spu/YIvcsG6xLO2r+2EMkoT9jzhhHFxqQMehJ JlVFhEo30R/dyUhqD1G+TAfZVlqmtm1nFJVk/2gSRUfo7FtHmbLo7gJdRHWeWfBjdmPm DPciAVRXifK7o6PsRe/LMbjWr65/Fu5dlVj27bBJuuEgDrCUXEn4vTowoFcNNNhdSptw DNqOAUqVqJ5zJtRJIcXTQPP6YaI9zHt3Eo0bxN/+92N3CQJ9eRNi5etVO3f2VqnSnMnl LS9w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z56W91f7fqmIDFSLo4iJF9+SrfI/T8Kx4jtFNkkkjzw=; b=ijlgXXjR8WX9FiFgDS+WjFhycgZqEFvAqyg4vSJ/ovPe1uBN9+Luvd/HbLQOTwboJJ YthOcLnHXxD66b0eS5H9s7KP3msxYbRpeIRsQj626yiNKrr/goY8VJMVgjVwPtY2G+XL oXXaubgzo2Is4xpo4Tka1MklPHBDhC3PAP9Ge9qfMlEbGkmDmgggC76xvdhX2kULk8Fh pVRV4dZzDjl2+vs5+SVy4TWzhh7Q/6TEe+cI8AqfE7BBLGyDM6dRfNtnASAQnpLVA0ra eFUkr+SJ2CpT3jWqxcM6kPLlBIwj+hgRgaV6ZHEbMMnUey/bPadXcBf1lHT93z+oV8B9 h9BA== X-Gm-Message-State: AHQUAuaU4K0Oq4PF4qY5cOD0FPWKwilKTsn5VmN4RZVoVqAUzKPyTsB8 j8QcY43VgMW/PN8jCFS6JyY8Aw== X-Google-Smtp-Source: AHgI3IaqtZZIN/H9RqZ5gAnvMDY+UmAo0KBTaI2NvxnknK+IG282wnQAzpD+m61G25BbXjxFwbvBwg== X-Received: by 2002:a7b:c764:: with SMTP id x4mr7468234wmk.47.1549881433564; Mon, 11 Feb 2019 02:37:13 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id i192sm11121275wmg.7.2019.02.11.02.37.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Feb 2019 02:37:12 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Alan Stern , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Linus Walleij , Bartosz Golaszewski Subject: [PATCH v2 6/8] ARM: davinci: omapl138-hawk: remove legacy usb helpers Date: Mon, 11 Feb 2019 11:37:00 +0100 Message-Id: <20190211103702.4277-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211103702.4277-1-brgl@bgdev.pl> References: <20190211103702.4277-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartosz Golaszewski The logic implemented by these routines now lives in the da8xx-ohci driver. Remove dead code. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/board-omapl138-hawk.c | 75 +-------------------- 1 file changed, 1 insertion(+), 74 deletions(-) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 856c5707bae9..88a0c62eee86 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -294,9 +294,6 @@ static int omapl138_hawk_register_aemif(void) return platform_device_register(&omapl138_hawk_aemif_device); } -static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id); -static da8xx_ocic_handler_t hawk_usb_ocic_handler; - static const short da850_hawk_usb11_pins[] = { DA850_GPIO2_4, DA850_GPIO6_13, -1 @@ -310,58 +307,11 @@ static struct gpiod_lookup_table hawk_usb_gpio_lookup = { }, }; -static int hawk_usb_set_power(unsigned port, int on) -{ - gpio_set_value(DA850_USB1_VBUS_PIN, on); - return 0; -} - -static int hawk_usb_get_power(unsigned port) -{ - return gpio_get_value(DA850_USB1_VBUS_PIN); -} - -static int hawk_usb_get_oci(unsigned port) -{ - return !gpio_get_value(DA850_USB1_OC_PIN); -} - -static int hawk_usb_ocic_notify(da8xx_ocic_handler_t handler) -{ - int irq = gpio_to_irq(DA850_USB1_OC_PIN); - int error = 0; - - if (handler != NULL) { - hawk_usb_ocic_handler = handler; - - error = request_irq(irq, omapl138_hawk_usb_ocic_irq, - IRQF_TRIGGER_RISING | - IRQF_TRIGGER_FALLING, - "OHCI over-current indicator", NULL); - if (error) - pr_err("%s: could not request IRQ to watch " - "over-current indicator changes\n", __func__); - } else { - free_irq(irq, NULL); - } - return error; -} - static struct da8xx_ohci_root_hub omapl138_hawk_usb11_pdata = { - .set_power = hawk_usb_set_power, - .get_power = hawk_usb_get_power, - .get_oci = hawk_usb_get_oci, - .ocic_notify = hawk_usb_ocic_notify, /* TPS2087 switch @ 5V */ .potpgt = (3 + 1) / 2, /* 3 ms max */ }; -static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id) -{ - hawk_usb_ocic_handler(&omapl138_hawk_usb11_pdata, 1); - return IRQ_HANDLED; -} - static __init void omapl138_hawk_usb_init(void) { int ret; @@ -382,36 +332,13 @@ static __init void omapl138_hawk_usb_init(void) pr_warn("%s: USB PHY registration failed: %d\n", __func__, ret); - ret = gpio_request_one(DA850_USB1_VBUS_PIN, - GPIOF_DIR_OUT, "USB1 VBUS"); - if (ret < 0) { - pr_err("%s: failed to request GPIO for USB 1.1 port " - "power control: %d\n", __func__, ret); - return; - } - - ret = gpio_request_one(DA850_USB1_OC_PIN, - GPIOF_DIR_IN, "USB1 OC"); - if (ret < 0) { - pr_err("%s: failed to request GPIO for USB 1.1 port " - "over-current indicator: %d\n", __func__, ret); - goto usb11_setup_oc_fail; - } - gpiod_add_lookup_table(&hawk_usb_gpio_lookup); ret = da8xx_register_usb11(&omapl138_hawk_usb11_pdata); - if (ret) { + if (ret) pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret); - goto usb11_setup_fail; - } return; - -usb11_setup_fail: - gpio_free(DA850_USB1_OC_PIN); -usb11_setup_oc_fail: - gpio_free(DA850_USB1_VBUS_PIN); } static __init void omapl138_hawk_init(void) -- 2.20.1