From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH 03/36] usb: gadget: s3c: use platform resources Date: Thu, 10 Oct 2019 22:29:47 +0200 Message-ID: <20191010203043.1241612-3-arnd@arndb.de> References: <20191010202802.1132272-1-arnd@arndb.de> <20191010203043.1241612-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191010203043.1241612-1-arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Kukjin Kim , Krzysztof Kozlowski Cc: Felipe Balbi , linux-samsung-soc@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman , linus.walleij@linaro.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-samsung-soc@vger.kernel.org VGhlIHJlc291cmNlcyBhcmUgY29ycmVjdGx5IGluaXRpYWxpemVkLCBzbyBqdXN0IHVzZSB0aGVt Cmluc3RlYWQgb2YgcmVseWluZyBvbiBoYXJkY29kZWQgZGF0YSBmcm9tIHBsYXRmb3JtIGhlYWRl cnMuCgpTaWduZWQtb2ZmLWJ5OiBBcm5kIEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPgotLS0KIGRy aXZlcnMvdXNiL2dhZGdldC91ZGMvczNjMjQxMF91ZGMuYyAgICAgICAgICB8IDMxICsrKysrKyst LS0tLS0tLS0tLS0KIGRyaXZlcnMvdXNiL2dhZGdldC91ZGMvczNjMjQxMF91ZGMuaCAgICAgICAg ICB8ICAxICsKIC4uLi91c2IvZ2FkZ2V0L3VkYy9zM2MyNDEwX3VkY19yZWdzLmggICAgICAgICB8 ICAwCiAzIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQog cmVuYW1lIGFyY2gvYXJtL3BsYXQtc2Ftc3VuZy9pbmNsdWRlL3BsYXQvcmVncy11ZGMuaCA9PiBk cml2ZXJzL3VzYi9nYWRnZXQvdWRjL3MzYzI0MTBfdWRjX3JlZ3MuaCAoMTAwJSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL3VzYi9nYWRnZXQvdWRjL3MzYzI0MTBfdWRjLmMgYi9kcml2ZXJzL3VzYi9n YWRnZXQvdWRjL3MzYzI0MTBfdWRjLmMKaW5kZXggZjgyMjA4ZmJjMjQ5Li5lNDExZDI3Yjc5ZmMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2dhZGdldC91ZGMvczNjMjQxMF91ZGMuYworKysgYi9k cml2ZXJzL3VzYi9nYWRnZXQvdWRjL3MzYzI0MTBfdWRjLmMKQEAgLTM2LDE1ICszNiwxMSBAQAog I2luY2x1ZGUgPGFzbS9ieXRlb3JkZXIuaD4KICNpbmNsdWRlIDxhc20vaXJxLmg+CiAjaW5jbHVk ZSA8YXNtL3VuYWxpZ25lZC5oPgotI2luY2x1ZGUgPG1hY2gvaXJxcy5oPgogCi0jaW5jbHVkZSA8 bWFjaC9oYXJkd2FyZS5oPgotCi0jaW5jbHVkZSA8cGxhdC9yZWdzLXVkYy5oPgogI2luY2x1ZGUg PGxpbnV4L3BsYXRmb3JtX2RhdGEvdXNiLXMzYzI0MTBfdWRjLmg+CiAKLQogI2luY2x1ZGUgInMz YzI0MTBfdWRjLmgiCisjaW5jbHVkZSAiczNjMjQxMF91ZGNfcmVncy5oIgogCiAjZGVmaW5lIERS SVZFUl9ERVNDCSJTM0MyNDEwIFVTQiBEZXZpY2UgQ29udHJvbGxlciBHYWRnZXQiCiAjZGVmaW5l IERSSVZFUl9BVVRIT1IJIkhlcmJlcnQgUMO2dHpsIDxoZXJiZXJ0QDEzdGhmbG9vci5hdD4sICIg XApAQCAtNTcsNiArNTMsNyBAQCBzdGF0aWMgc3RydWN0IHMzYzI0MTBfdWRjCSp0aGVfY29udHJv bGxlcjsKIHN0YXRpYyBzdHJ1Y3QgY2xrCQkqdWRjX2Nsb2NrOwogc3RhdGljIHN0cnVjdCBjbGsJ CSp1c2JfYnVzX2Nsb2NrOwogc3RhdGljIHZvaWQgX19pb21lbQkJKmJhc2VfYWRkcjsKK3N0YXRp YyBpbnQJCQlpcnFfdXNiZDsKIHN0YXRpYyB1NjQJCQlyc3JjX3N0YXJ0Owogc3RhdGljIHU2NAkJ CXJzcmNfbGVuOwogc3RhdGljIHN0cnVjdCBkZW50cnkJCSpzM2MyNDEwX3VkY19kZWJ1Z2ZzX3Jv b3Q7CkBAIC04MzksOCArODM2LDYgQEAgc3RhdGljIHZvaWQgczNjMjQxMF91ZGNfaGFuZGxlX2Vw KHN0cnVjdCBzM2MyNDEwX2VwICplcCkKIAl9CiB9CiAKLSNpbmNsdWRlIDxtYWNoL3JlZ3MtaXJx Lmg+Ci0KIC8qCiAgKglzM2MyNDEwX3VkY19pcnEgLSBpbnRlcnJ1cHQgaGFuZGxlcgogICovCkBA IC05ODEsNyArOTc2LDcgQEAgc3RhdGljIGlycXJldHVybl90IHMzYzI0MTBfdWRjX2lycShpbnQg ZHVtbXksIHZvaWQgKl9kZXYpCiAJCX0KIAl9CiAKLQlkcHJpbnRrKERFQlVHX1ZFUkJPU0UsICJp cnE6ICVkIHMzYzI0MTBfdWRjX2RvbmUuXG4iLCBJUlFfVVNCRCk7CisJZHByaW50ayhERUJVR19W RVJCT1NFLCAiaXJxOiAlZCBzM2MyNDEwX3VkY19kb25lLlxuIiwgaXJxX3VzYmQpOwogCiAJLyog UmVzdG9yZSBvbGQgaW5kZXggKi8KIAl1ZGNfd3JpdGUoaWR4LCBTM0MyNDEwX1VEQ19JTkRFWF9S RUcpOwpAQCAtMTc4NCwxMyArMTc3OSw3IEBAIHN0YXRpYyBpbnQgczNjMjQxMF91ZGNfcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlzcGluX2xvY2tfaW5pdCgmdWRjLT5sb2Nr KTsKIAl1ZGNfaW5mbyA9IGRldl9nZXRfcGxhdGRhdGEoJnBkZXYtPmRldik7CiAKLQlyc3JjX3N0 YXJ0ID0gUzNDMjQxMF9QQV9VU0JERVY7Ci0JcnNyY19sZW4gICA9IFMzQzI0WFhfU1pfVVNCREVW OwotCi0JaWYgKCFyZXF1ZXN0X21lbV9yZWdpb24ocnNyY19zdGFydCwgcnNyY19sZW4sIGdhZGdl dF9uYW1lKSkKLQkJcmV0dXJuIC1FQlVTWTsKLQotCWJhc2VfYWRkciA9IGlvcmVtYXAocnNyY19z dGFydCwgcnNyY19sZW4pOworCWJhc2VfYWRkciA9IGRldm1fcGxhdGZvcm1faW9yZW1hcF9yZXNv dXJjZShwZGV2LCAwKTsKIAlpZiAoIWJhc2VfYWRkcikgewogCQlyZXR2YWwgPSAtRU5PTUVNOwog CQlnb3RvIGVycl9tZW07CkBAIC0xODAyLDE3ICsxNzkxLDE5IEBAIHN0YXRpYyBpbnQgczNjMjQx MF91ZGNfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlzM2MyNDEwX3VkY19k aXNhYmxlKHVkYyk7CiAJczNjMjQxMF91ZGNfcmVpbml0KHVkYyk7CiAKKwlpcnFfdXNiZCA9IHBs YXRmb3JtX2dldF9pcnEocGRldiwgMCk7CisKIAkvKiBpcnEgc2V0dXAgYWZ0ZXIgb2xkIGhhcmR3 YXJlIHN0YXRlIGlzIGNsZWFuZWQgdXAgKi8KLQlyZXR2YWwgPSByZXF1ZXN0X2lycShJUlFfVVNC RCwgczNjMjQxMF91ZGNfaXJxLAorCXJldHZhbCA9IHJlcXVlc3RfaXJxKGlycV91c2JkLCBzM2My NDEwX3VkY19pcnEsCiAJCQkgICAgIDAsIGdhZGdldF9uYW1lLCB1ZGMpOwogCiAJaWYgKHJldHZh bCAhPSAwKSB7Ci0JCWRldl9lcnIoZGV2LCAiY2Fubm90IGdldCBpcnEgJWksIGVyciAlZFxuIiwg SVJRX1VTQkQsIHJldHZhbCk7CisJCWRldl9lcnIoZGV2LCAiY2Fubm90IGdldCBpcnEgJWksIGVy ciAlZFxuIiwgaXJxX3VzYmQsIHJldHZhbCk7CiAJCXJldHZhbCA9IC1FQlVTWTsKIAkJZ290byBl cnJfbWFwOwogCX0KIAotCWRldl9kYmcoZGV2LCAiZ290IGlycSAlaVxuIiwgSVJRX1VTQkQpOwor CWRldl9kYmcoZGV2LCAiZ290IGlycSAlaVxuIiwgaXJxX3VzYmQpOwogCiAJaWYgKHVkY19pbmZv ICYmIHVkY19pbmZvLT52YnVzX3BpbiA+IDApIHsKIAkJcmV0dmFsID0gZ3Bpb19yZXF1ZXN0KHVk Y19pbmZvLT52YnVzX3BpbiwgInVkYyB2YnVzIik7CkBAIC0xODc5LDcgKzE4NzAsNyBAQCBzdGF0 aWMgaW50IHMzYzI0MTBfdWRjX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJ aWYgKHVkY19pbmZvICYmIHVkY19pbmZvLT52YnVzX3BpbiA+IDApCiAJCWdwaW9fZnJlZSh1ZGNf aW5mby0+dmJ1c19waW4pOwogZXJyX2ludDoKLQlmcmVlX2lycShJUlFfVVNCRCwgdWRjKTsKKwlm cmVlX2lycShpcnFfdXNiZCwgdWRjKTsKIGVycl9tYXA6CiAJaW91bm1hcChiYXNlX2FkZHIpOwog ZXJyX21lbToKQEAgLTE5MTMsNyArMTkwNCw3IEBAIHN0YXRpYyBpbnQgczNjMjQxMF91ZGNfcmVt b3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJCWZyZWVfaXJxKGlycSwgdWRjKTsK IAl9CiAKLQlmcmVlX2lycShJUlFfVVNCRCwgdWRjKTsKKwlmcmVlX2lycShpcnFfdXNiZCwgdWRj KTsKIAogCWlvdW5tYXAoYmFzZV9hZGRyKTsKIAlyZWxlYXNlX21lbV9yZWdpb24ocnNyY19zdGFy dCwgcnNyY19sZW4pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvZ2FkZ2V0L3VkYy9zM2MyNDEw X3VkYy5oIGIvZHJpdmVycy91c2IvZ2FkZ2V0L3VkYy9zM2MyNDEwX3VkYy5oCmluZGV4IGJkY2Fh OGRkMzAwZi4uNjhiZGYzZTVhYWMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9nYWRnZXQvdWRj L3MzYzI0MTBfdWRjLmgKKysrIGIvZHJpdmVycy91c2IvZ2FkZ2V0L3VkYy9zM2MyNDEwX3VkYy5o CkBAIC05MCw2ICs5MCw3IEBAIHN0cnVjdCBzM2MyNDEwX3VkYyB7CiAJdW5zaWduZWQJCQlyZXFf cGVuZGluZyA6IDE7CiAJdTgJCQkJdmJ1czsKIAlzdHJ1Y3QgZGVudHJ5CQkJKnJlZ3NfaW5mbzsK KwlpbnQJCQkJaXJxOwogfTsKICNkZWZpbmUgdG9fczNjMjQxMChnKQkoY29udGFpbmVyX29mKChn KSwgc3RydWN0IHMzYzI0MTBfdWRjLCBnYWRnZXQpKQogCmRpZmYgLS1naXQgYS9hcmNoL2FybS9w bGF0LXNhbXN1bmcvaW5jbHVkZS9wbGF0L3JlZ3MtdWRjLmggYi9kcml2ZXJzL3VzYi9nYWRnZXQv dWRjL3MzYzI0MTBfdWRjX3JlZ3MuaApzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20g YXJjaC9hcm0vcGxhdC1zYW1zdW5nL2luY2x1ZGUvcGxhdC9yZWdzLXVkYy5oCnJlbmFtZSB0byBk cml2ZXJzL3VzYi9nYWRnZXQvdWRjL3MzYzI0MTBfdWRjX3JlZ3MuaAotLSAKMi4yMC4wCgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtl cm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0 dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5l bAo= 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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 9F3B9C4360C for ; Thu, 10 Oct 2019 20:31:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68F89208C3 for ; Thu, 10 Oct 2019 20:31:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726839AbfJJUbn (ORCPT ); Thu, 10 Oct 2019 16:31:43 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:37625 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726666AbfJJUbm (ORCPT ); Thu, 10 Oct 2019 16:31:42 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MS1G7-1ig9Fo3Vvv-00TYCf; Thu, 10 Oct 2019 22:31:31 +0200 From: Arnd Bergmann To: Kukjin Kim , Krzysztof Kozlowski Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, Arnd Bergmann , Felipe Balbi , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH 03/36] usb: gadget: s3c: use platform resources Date: Thu, 10 Oct 2019 22:29:47 +0200 Message-Id: <20191010203043.1241612-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191010203043.1241612-1-arnd@arndb.de> References: <20191010202802.1132272-1-arnd@arndb.de> <20191010203043.1241612-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:iwNwd1cVxFxCrms7c8C5XzuQmcy9u/dn0xzTwy3RMzXW1HxHseW IktW/Os21uQmVtkwkRfdK8qY77KGxRXzPq9asnOccmpMKGioJurl5rwTvNROCMQ0hv7uHM1 5n3b0f1Gq1uQp5GkmFlZaHhavVkQl4zYOZ06/7iFrVU7yhx4YAWQB741n54+opUgSOKqapx Uqd7p7XE5W4DODvUhpdkg== X-UI-Out-Filterresults: notjunk:1;V03:K0:/KCtwZvm948=:MjTG6wQH6Bxkes8aciFuXb wupIQgdWQkr5jGLLinWtBtmLJ2v2beVp77GUTiiOxUYG6E8z5XEN47Fg5bXASQZeY78NP+X28 cuF+YJlcr9ywwhZamJFnQv8guj15mlGyx1EHNB+ZC5Dj2ob/Lmh+lo4+vK61tQsonzDlO0DvC qs7fRaIZeBcRWlPX75oaPOBrcGGoQN8+CTB7LemcVNUxkBUFKLtSB+OU+d1hbjT1vRgsXztYw GN7CJbrxCk4nLJ9+XwC4en0QBzhQ2Dl/wlyO1vRAVjPE8W/OS4SJSXNW8Nym8gE+PNpJwveDb qhbuXxK65AEu9ev0p6t4voIPYRdP2yo8g/comURhSF+9CpGPrxsoPb0TlD2JvRt6IgPxxTV83 3SlyGem/ISFtWbADtVkvTPwGxi6UPb33hVZF4A0XJfGRDrTOQ/+DOm1AfByNGebaPk++ZU4Ea LimmQYfyqNq4cxGUFua7x3Wx6PyPUhyyAJgJsJYu64uyDP3Hl/eLjV5kQ6nu/Wb6A+5oUkzXA Jl8FyQRkuwZP6zKUZC6moi3BtS6nOUpVieam8Xjao9HN5Fn7/t/Gs0o6aUoKhUGuGKBR19A9q n8kEG8c5zJJ36ptDqdr7XBFzFsvhSipybIw44e+YZZmojMFTusmcexy17QfjG4fTYnpR9ipCG taBNgRpoSESiUXenE+9ZFSjQ0sV8YLIR4wOs9Ml/wWbVND+oPHTEEzInk/73Av+ppsgtPa9fw 2U1M7pDIYSarTkneuXbiBHGIDID1b+Vh+9srUMkHEz3IRWIdD2QoiHZkuwi882ECwm4/w5Ny/ a2RxIEEXJ+5AVS9XPQh5C3rdadtoJUIwQdrPPcQKEhJB8OoJzkEwYN8XmML3GnFjITtOZzc0Y 2akHoI5CkL2+FlbMBIpQ== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Message-ID: <20191010202947.RzjKA3lnWoliftsRSNutC3M2_J5ecf-5foenmB0YpUI@z> The resources are correctly initialized, so just use them instead of relying on hardcoded data from platform headers. Signed-off-by: Arnd Bergmann --- drivers/usb/gadget/udc/s3c2410_udc.c | 31 +++++++------------ drivers/usb/gadget/udc/s3c2410_udc.h | 1 + .../usb/gadget/udc/s3c2410_udc_regs.h | 0 3 files changed, 12 insertions(+), 20 deletions(-) rename arch/arm/plat-samsung/include/plat/regs-udc.h => drivers/usb/gadget/udc/s3c2410_udc_regs.h (100%) diff --git a/drivers/usb/gadget/udc/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c index f82208fbc249..e411d27b79fc 100644 --- a/drivers/usb/gadget/udc/s3c2410_udc.c +++ b/drivers/usb/gadget/udc/s3c2410_udc.c @@ -36,15 +36,11 @@ #include #include #include -#include -#include - -#include #include - #include "s3c2410_udc.h" +#include "s3c2410_udc_regs.h" #define DRIVER_DESC "S3C2410 USB Device Controller Gadget" #define DRIVER_AUTHOR "Herbert Pötzl , " \ @@ -57,6 +53,7 @@ static struct s3c2410_udc *the_controller; static struct clk *udc_clock; static struct clk *usb_bus_clock; static void __iomem *base_addr; +static int irq_usbd; static u64 rsrc_start; static u64 rsrc_len; static struct dentry *s3c2410_udc_debugfs_root; @@ -839,8 +836,6 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep) } } -#include - /* * s3c2410_udc_irq - interrupt handler */ @@ -981,7 +976,7 @@ static irqreturn_t s3c2410_udc_irq(int dummy, void *_dev) } } - dprintk(DEBUG_VERBOSE, "irq: %d s3c2410_udc_done.\n", IRQ_USBD); + dprintk(DEBUG_VERBOSE, "irq: %d s3c2410_udc_done.\n", irq_usbd); /* Restore old index */ udc_write(idx, S3C2410_UDC_INDEX_REG); @@ -1784,13 +1779,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) spin_lock_init(&udc->lock); udc_info = dev_get_platdata(&pdev->dev); - rsrc_start = S3C2410_PA_USBDEV; - rsrc_len = S3C24XX_SZ_USBDEV; - - if (!request_mem_region(rsrc_start, rsrc_len, gadget_name)) - return -EBUSY; - - base_addr = ioremap(rsrc_start, rsrc_len); + base_addr = devm_platform_ioremap_resource(pdev, 0); if (!base_addr) { retval = -ENOMEM; goto err_mem; @@ -1802,17 +1791,19 @@ static int s3c2410_udc_probe(struct platform_device *pdev) s3c2410_udc_disable(udc); s3c2410_udc_reinit(udc); + irq_usbd = platform_get_irq(pdev, 0); + /* irq setup after old hardware state is cleaned up */ - retval = request_irq(IRQ_USBD, s3c2410_udc_irq, + retval = request_irq(irq_usbd, s3c2410_udc_irq, 0, gadget_name, udc); if (retval != 0) { - dev_err(dev, "cannot get irq %i, err %d\n", IRQ_USBD, retval); + dev_err(dev, "cannot get irq %i, err %d\n", irq_usbd, retval); retval = -EBUSY; goto err_map; } - dev_dbg(dev, "got irq %i\n", IRQ_USBD); + dev_dbg(dev, "got irq %i\n", irq_usbd); if (udc_info && udc_info->vbus_pin > 0) { retval = gpio_request(udc_info->vbus_pin, "udc vbus"); @@ -1879,7 +1870,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) if (udc_info && udc_info->vbus_pin > 0) gpio_free(udc_info->vbus_pin); err_int: - free_irq(IRQ_USBD, udc); + free_irq(irq_usbd, udc); err_map: iounmap(base_addr); err_mem: @@ -1913,7 +1904,7 @@ static int s3c2410_udc_remove(struct platform_device *pdev) free_irq(irq, udc); } - free_irq(IRQ_USBD, udc); + free_irq(irq_usbd, udc); iounmap(base_addr); release_mem_region(rsrc_start, rsrc_len); diff --git a/drivers/usb/gadget/udc/s3c2410_udc.h b/drivers/usb/gadget/udc/s3c2410_udc.h index bdcaa8dd300f..68bdf3e5aac2 100644 --- a/drivers/usb/gadget/udc/s3c2410_udc.h +++ b/drivers/usb/gadget/udc/s3c2410_udc.h @@ -90,6 +90,7 @@ struct s3c2410_udc { unsigned req_pending : 1; u8 vbus; struct dentry *regs_info; + int irq; }; #define to_s3c2410(g) (container_of((g), struct s3c2410_udc, gadget)) diff --git a/arch/arm/plat-samsung/include/plat/regs-udc.h b/drivers/usb/gadget/udc/s3c2410_udc_regs.h similarity index 100% rename from arch/arm/plat-samsung/include/plat/regs-udc.h rename to drivers/usb/gadget/udc/s3c2410_udc_regs.h -- 2.20.0