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=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 39D05C43381 for ; Thu, 21 Feb 2019 14:41:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEC3D2084D for ; Thu, 21 Feb 2019 14:41:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550760100; bh=g5u/1ym5QfXalnPCE15rPu0hPy3iAxnPc2YbunmBBCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bsnWMQ9TCReeu3zgBOqJEHD2ABdsD+NYq3D4JhyZhECnyJn1rKVviMS3F1+eZGkP0 +G+AeHuFQ5HMB1AyTL0TgKrXQaqSynxnErrh1l8J3YQ0+vBetP4KP23t1x96YLlsqD uROL9rw3asPGU5oSOdDLOx07H+WDKY3vAEJuhoIQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729373AbfBUOli (ORCPT ); Thu, 21 Feb 2019 09:41:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:36756 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729335AbfBUOlf (ORCPT ); Thu, 21 Feb 2019 09:41:35 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 19A7D2084D; Thu, 21 Feb 2019 14:41:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550760094; bh=g5u/1ym5QfXalnPCE15rPu0hPy3iAxnPc2YbunmBBCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cfnZ9dcuVvYLV754m9N8tzo6Wbp6iTr3NI+eTsIfLoVWLGMKwQKjckVeTtGDjWQni PlbPHQFukEVTP0aVEfEHZ80Cuv2Js/nNW1l+KhH1iWzoostX5SzzjtzODzzOYgOQHR PyTsX93O9fhjbSroSzCFoy9kBHH2daXXRV72BwCk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Blumenstingl , Ulf Hansson Subject: [PATCH 4.19 24/30] mmc: meson-gx: fix interrupt name Date: Thu, 21 Feb 2019 15:36:06 +0100 Message-Id: <20190221125251.936239963@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221125250.543158526@linuxfoundation.org> References: <20190221125250.543158526@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Martin Blumenstingl commit 83e418a805d880a8b18add07f94d19b2a5a80307 upstream. 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 Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/meson-gx-mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -1286,7 +1286,8 @@ static int meson_mmc_probe(struct platfo 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;