From patchwork Sat Feb 9 00:58:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10803969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18A6C13B4 for ; Sat, 9 Feb 2019 00:59:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF52B2ECC3 for ; Sat, 9 Feb 2019 00:59:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E019C2ECD5; Sat, 9 Feb 2019 00:59:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 92B502ECC3 for ; Sat, 9 Feb 2019 00:59:21 +0000 (UTC) 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: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:In-Reply-To:References: List-Owner; bh=F4q4OMIayiVK7fpwC+96OtqTupxyS5ilh4RqBT6sO14=; b=LCpowYE4MKPhLH g4S47pUsopH2k6vhajhIimwu6aG5aU+HIFZmhe6e58LcdtqSMDPHwVemCb6R0grjB1JY34113737n otLvs6wSIZIgTT0qS2XXrHAX6O1H6m/oCYE/rAkoOVRdsT3H12CyP2rIlGPIGkbHkLO/kKcyYrWjM slUTWxyvGQmVUd66w2qGOuubUXC/br0Nu7MWVQVNxaL0B7CjnG+ZFEY42j4PkqqHy9/l+Jcbr/B3H DJHpoTRDphPKt5r7DUoAhIM/FCHIHb71o59nZUVQSNGVR9USKEEEvruMSEdtXeu0DizfK0nePFdp6 0kaJ0oqXsucME62MmFOw==; 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 1gsGzI-0001Hm-To; Sat, 09 Feb 2019 00:59:20 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gsGzF-0001HN-G4; Sat, 09 Feb 2019 00:59:18 +0000 Received: by mail-wm1-x344.google.com with SMTP id x10so947616wmg.2; Fri, 08 Feb 2019 16:59:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DGa6W9vj/kUe70sQNoT86/G0huD4FXwnKFkVKgNXoQw=; b=F01ENsqK16OGY4RxNKc2OMzBwf5yrZ4wCIwWQNO/4LYg6MLIEJlc02wPBw38WP9955 82iyOgVKyl739KuDZSYORecXu0aFYc3Q22CiolTLTRiVaazZLddybRDZq18/YOafuZMT /Of/WJq875aZkhs3/AyHXXeMPmGswnLHTBU7nfVOtTQxYIp0RR4j2UbOHLQwiLAAjkIu 4RDTuG9dYBjBnxkS8jJGohfe17c3JhIPUVVt9BTvWNKO1gUNALcJSQUcpRltbAQNuliz 5QhGOIlvSKCi8v8yIdeA4MhapXGJYhIRGtt7Jg0qfeBww6uoAtPP5Y7QjpxpqMsyUlhu +czw== 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:mime-version :content-transfer-encoding; bh=DGa6W9vj/kUe70sQNoT86/G0huD4FXwnKFkVKgNXoQw=; b=aJrsvuV37uUIcnFlyR9nhY8JM7DxF12BTrNYP1xIHQ2iCKyag5olvWZzbOqleVdQll xOqdhYmnY9X8MStvX/J8jeewQYeMS/YlPXdmEBS49bU3BMlpwSBcI0mhCp8J7ygs3ro4 PSyE2pFVRCts1Z5wkbBEQKXk/2MX5uv6ZcT5ccBqV5g/oIXLL2fg/PsIsn1SfoRK4das RPZFMaBgSqsyf9Lzhgr9MNmMG204YbzSoiFMONFq/J/Ob7jhMp5zaNooCZX4UDRgK4XE NeVSh3XiUa2jNg+k+yQG1da7phUdb52iGKSk9vm8q6prfotyNHh2Xec7zSuLMZASWQ4C rEtg== X-Gm-Message-State: AHQUAuagQ9h1Z9EuFUC7YWALD5+kj9k7fvOqXH5JBXC9bhfoZOEgNawq 5IikijqQtpzdWFAx0FIXC5Z8XDDe X-Google-Smtp-Source: AHgI3IahYwaG7K5cuPcQT4k4GJabsekXAkbkB/xF0Km+P0CJfaT1QoD960AjYh+fBRPNoCwkKcH/5Q== X-Received: by 2002:a1c:be11:: with SMTP id o17mr843180wmf.111.1549673955796; Fri, 08 Feb 2019 16:59:15 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD70B4600C545FEF64E1C6C81.dip0.t-ipconnect.de. [2003:dc:d70b:4600:c545:fef6:4e1c:6c81]) by smtp.googlemail.com with ESMTPSA id r14sm4927201wrr.65.2019.02.08.16.59.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 16:59:14 -0800 (PST) From: Martin Blumenstingl To: ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH] mmc: meson-gx: fix interrupt name Date: Sat, 9 Feb 2019 01:58:50 +0100 Message-Id: <20190209005850.11457-1-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190208_165917_564106_88E4DEC9 X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xademax@gmail.com, Martin Blumenstingl , repk@triplefau.lt, linux-arm-kernel@lists.infradead.org, jbrunet@baylibre.com Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Commit bb364890323cca ("mmc: meson-gx: Free irq in release() callback") changed the _probe code to use request_threaded_irq() instead of devm_request_threaded_irq(). Unfortunately this removes a fallback for the interrupt name: devm_request_threaded_irq() uses the device name as fallback if the given IRQ name is NULL. request_threaded_irq() has no such fallback, thus /proc/interrupts shows "(null)" instead. Explicitly pass the dev_name() so we get the IRQ name shown in /proc/interrupts again. While here, also fix the indentation of the request_threaded_irq() parameter list. Fixes: bb364890323cca ("mmc: meson-gx: Free irq in release() callback") Signed-off-by: Martin Blumenstingl --- drivers/mmc/host/meson-gx-mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index f19ec60bcbdc..2eba507790e4 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -1338,7 +1338,8 @@ static int meson_mmc_probe(struct platform_device *pdev) host->regs + SD_EMMC_IRQ_EN); ret = request_threaded_irq(host->irq, meson_mmc_irq, - meson_mmc_irq_thread, IRQF_SHARED, NULL, host); + meson_mmc_irq_thread, IRQF_SHARED, + dev_name(&pdev->dev), host); if (ret) goto err_init_clk;