From patchwork Fri Oct 6 10:58:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13411274 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AD86E92711 for ; Fri, 6 Oct 2023 10:58:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231678AbjJFK6M (ORCPT ); Fri, 6 Oct 2023 06:58:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231822AbjJFK6K (ORCPT ); Fri, 6 Oct 2023 06:58:10 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B252DB; Fri, 6 Oct 2023 03:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696589889; x=1728125889; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=xHrblxy5LJz/0z88RZl5mzsZZ2ICJvk7WRsbXXPcjSk=; b=eLfRYWCV3bGI9irzossFRI9/pg/VNjFK9yV54VSiSlbq7GbosVmYoMF0 NYeCA7aTc8HLUYOe7QPebB05miOkvZAlYW7vKcTXUF4xeUj4z5bY9IaOJ ViJL+cfyluUPt19JuP0J+E/Bzz14oIPiG9n09Q6uBjtBAkXdoc57oSrZy nx0yPvJjhINCu/I2mtsCwkOMyaEtCbBbVEe28P9XHt4yM9T/lmJj/eT71 FaaAHwMFOr5tnFBBqaZmGN97EDfXImPgeAuTKT1FWUM/ulDCEZ/Iyfu9j 8XWlcWgdKo25EWBk5LUcLkeLEdGiiPsUOr7sH6M2GgXGp8Uyn9rjbXXy7 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="363082468" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="363082468" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2023 03:58:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="875906267" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="875906267" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 06 Oct 2023 03:58:07 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5C8934F4; Fri, 6 Oct 2023 13:58:05 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Adrian Hunter , Ulf Hansson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/2] mmc: sdhci-pltfm: Drop unnecessary error messages in sdhci_pltfm_init() Date: Fri, 6 Oct 2023 13:58:02 +0300 Message-Id: <20231006105803.3374241-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The devm_platform_ioremap_resource() and platform_get_irq() print the error messages themselves and our "failed" one brings no value and just noise. Refactor code to avoid those noisy error messages. Signed-off-by: Andy Shevchenko Acked-by: Adrian Hunter --- drivers/mmc/host/sdhci-pltfm.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index a72e123a585d..4d1a703a5bdb 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -115,26 +115,21 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, { struct sdhci_host *host; void __iomem *ioaddr; - int irq, ret; + int irq; ioaddr = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(ioaddr)) { - ret = PTR_ERR(ioaddr); - goto err; - } + if (IS_ERR(ioaddr)) + return ERR_CAST(ioaddr); irq = platform_get_irq(pdev, 0); - if (irq < 0) { - ret = irq; - goto err; - } + if (irq < 0) + return ERR_PTR(irq); host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pltfm_host) + priv_size); - if (IS_ERR(host)) { - ret = PTR_ERR(host); - goto err; + dev_err(&pdev->dev, "%s failed %pe\n", __func__, host); + return ERR_CAST(host); } host->ioaddr = ioaddr; @@ -152,9 +147,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, platform_set_drvdata(pdev, host); return host; -err: - dev_err(&pdev->dev, "%s failed %d\n", __func__, ret); - return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(sdhci_pltfm_init); From patchwork Fri Oct 6 10:58:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13411275 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5F05E936F8 for ; Fri, 6 Oct 2023 10:58:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231868AbjJFK6M (ORCPT ); Fri, 6 Oct 2023 06:58:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231789AbjJFK6K (ORCPT ); Fri, 6 Oct 2023 06:58:10 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B43DDE; Fri, 6 Oct 2023 03:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696589889; x=1728125889; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=6MLMXL4M6BDsSXjfE8vIxvogcxwlXrYT4iShqFi4veI=; b=gLt7BjcQ7ti0yWSGBPQUmkX95Vqp2HkXomr7Z4H0WoO0vm4VY2r8ubTN I+0N7QfID++arH2a1wrf/rEO+U/3FjFsl2qg4h5J8JpSfGhOicchlUOQ4 bDf29M+vsLd8D8BAC7kqgZCFtiUxjYqUb/ROMv2bU7kJpTfGPNfPjEcL2 G6VgEy058vf3PcquLFuMDOPsilAwpt9NiVe3Lkd8+Kv3M+0Ga94PyhTtK B5ROYvSqYAXW1UnZr+XUQ4ZUvIEygHbETdy38g+Z1pcDNt01trrupTB9w H2y7LGZQYsFqPZBNYAsasuxUIG02KvmjsTtot/YogCAS1Ao7ftF7fLFe5 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="447915549" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="447915549" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2023 03:58:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="728807796" X-IronPort-AV: E=Sophos;i="6.03,203,1694761200"; d="scan'208";a="728807796" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 06 Oct 2023 03:58:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 86801430; Fri, 6 Oct 2023 13:58:05 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Adrian Hunter , Ulf Hansson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] mmc: sdhci-pltfm: Make driver OF independent Date: Fri, 6 Oct 2023 13:58:03 +0300 Message-Id: <20231006105803.3374241-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231006105803.3374241-1-andriy.shevchenko@linux.intel.com> References: <20231006105803.3374241-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Since we have device_is_compatible() API, drop OF dependency in the driver. Signed-off-by: Andy Shevchenko Acked-by: Adrian Hunter --- drivers/mmc/host/sdhci-pltfm.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 4d1a703a5bdb..62753d72198a 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef CONFIG_PPC #include #endif @@ -56,19 +55,16 @@ static bool sdhci_wp_inverted(struct device *dev) static void sdhci_get_compatibility(struct platform_device *pdev) { + struct device *dev = &pdev->dev; struct sdhci_host *host = platform_get_drvdata(pdev); - struct device_node *np = pdev->dev.of_node; - if (!np) - return; - - if (of_device_is_compatible(np, "fsl,p2020-rev1-esdhc")) + if (device_is_compatible(dev, "fsl,p2020-rev1-esdhc")) host->quirks |= SDHCI_QUIRK_BROKEN_DMA; - if (of_device_is_compatible(np, "fsl,p2020-esdhc") || - of_device_is_compatible(np, "fsl,p1010-esdhc") || - of_device_is_compatible(np, "fsl,t4240-esdhc") || - of_device_is_compatible(np, "fsl,mpc8536-esdhc")) + if (device_is_compatible(dev, "fsl,p2020-esdhc") || + device_is_compatible(dev, "fsl,p1010-esdhc") || + device_is_compatible(dev, "fsl,t4240-esdhc") || + device_is_compatible(dev, "fsl,mpc8536-esdhc")) host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; }