From patchwork Mon Jul 10 13:20:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 13307133 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A4FE9C001DE for ; Mon, 10 Jul 2023 13:21:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2IJEdvz8nEF/Ak1kODCsdXJ4p2xfrMqKOxl2KRiaOLw=; b=Z4rCZuPKsEB1E3 TedeKVm4cXmsornKzGsptKLYioVa+tkYjY25ho1DtqjoKLh3if/+U/q/jXfu3GdLpleVQh8TgOpAX tuA3SzbvIuLYXoPIK2rqyMKR029F/sldPwZLrjde3MokibknNJidxPBab6mbUpM9GSmP0SOs5yX7D HG224IW8GEWVzPtOOrPxizszEX8AR87H8RHcXV+zmQRI/zi9Daop39VXSi0jq1+/E8/u0U3fmngau P9qWrhY+VXSWnJFonU4vjz1siU0ph4Qg7fRppB3bqyU+gtcYjnnp10oh9hKyDKhz6zXmSxEIiUhJw 0VFMyaz5rvKfvE7utj6A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qIqod-00BjkW-0o; Mon, 10 Jul 2023 13:20:35 +0000 Received: from mail-tyzapc01on20723.outbound.protection.outlook.com ([2a01:111:f403:704b::723] helo=APC01-TYZ-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qIqoa-00Bjgt-1a for linux-arm-kernel@lists.infradead.org; Mon, 10 Jul 2023 13:20:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jivIK3E35MfKd3UUJKReIwrHcXvOfjb2FhKWBA3FzO/t9KYUHktzZo7BN7VNYfaOo/bGnW2G5IV2BkKp/aJXaI4NOLYeYynOFfIG/NZrOmmkQ5WwtB3I6Eo7BTBideUYocFhN2nU8zBgme2QCC3oVfS3DBRDcjiO6mRPxpq7zcCU68IZWwx0ADUiBe9tOVzmgbkP4o/CCw0vQfz2NvrYzKGb8vacLTkZfyu+uZUTNJnh7Q37ynUnUB6WoSrdludhuGh0Bc5kL39usD+UnX/QnwaR4jXd25ITbPjZ+Y/qBALcBvXaYhMp51OARZHtBSMuF827EgmRcXZ2bN8Qgn1Ffg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j3wMfQC2CGe5m7FMGneONO0IFk/KCAXfyyrwnKJ0Gtk=; b=bsueGKnxpaiJd0sWBapIs01TNCvUpyaeVgnwgLW6W7g/W4FGML1iC/wpFMKwlLo5rBXReHYi2+GIkOETp7nX7KUDv8lpUf/JCV8mJkZXpCa2m26j5ioe7bi02BPCZhoZt9BrPOjI5v/QP8BRvgpiaqzd2/kNWV9qYnbs4ptaH01Gl7zIMoDO9FSXjD5cycYChq1RV1pfygEnDWAUnzjvxeUtBmquUqy4PxPwjwSaE3PMDftP/No87dnSp0NxgZAOYiTDcBFSU73+zF1I4is7FCbRiR2p7jKmJ+YS6i1r+UHVz4gqveIan0Q2gbNHhOVYYAuHr7NTdgvSxn08M2OgUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j3wMfQC2CGe5m7FMGneONO0IFk/KCAXfyyrwnKJ0Gtk=; b=FgEZBzupginCJ3uP+xdqOP1RVmSJD8Q50XiK4iK/mfhPoj1agnVoncUoxjG+JYxu73C3V8UUQIsUVyD+BsByDiiWHK0f19f6FSu2VXvaWmFIqDzX8rgg63DGhwnBkCXInvMXmoly5kxnAJ9H2bzEzM763uRT3hWGBIz3tsz5Zmv8Kq9C+I/kQL2PsUjnSlPlP1LzVrpBBMZbVGHtaiYAI7EB9OuunWSOI+NhtgWHJKXnjse5hedjgwaV1RtTQiBhZ40aT3nOw2XrVIS2qELqbPAHJO9C/jVMNOFjWBPhNic5v/o1rrWnlfe4VlvEXH8S5z4Ybeg8HH4+SpGFBMsx5Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by TYZPR06MB5930.apcprd06.prod.outlook.com (2603:1096:400:336::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.26; Mon, 10 Jul 2023 13:20:18 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c%5]) with mapi id 15.20.6565.028; Mon, 10 Jul 2023 13:20:18 +0000 From: Yangtao Li To: Sascha Hauer , Pengutronix Kernel Team , Helge Deller , Shawn Guo , Fabio Estevam , NXP Linux Team Cc: Yangtao Li , linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] fbdev: imxfb: remove unneeded lable Date: Mon, 10 Jul 2023 21:20:01 +0800 Message-Id: <20230710132001.50764-4-frank.li@vivo.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230710132001.50764-1-frank.li@vivo.com> References: <20230710132001.50764-1-frank.li@vivo.com> X-ClientProxiedBy: SGBP274CA0005.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::17) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|TYZPR06MB5930:EE_ X-MS-Office365-Filtering-Correlation-Id: c1314334-f83e-42dc-c20a-08db814867e1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ziZtKuS1Jbo4j6qyj5+QQj3ygDaRXXSQkwivuituYMGJstAOjOHUolq+3h0N9rF6z7YJrfYx0wVfn2/ry9blE5tEUgnalQ0Xu2XKCVInrfrBJP0jWg1ql51v9ZX8JBx797++NmphLgUyj2CM2k9rfByZPTAmCVbRALZuMvlnnJQi9RkmDscNTq6JTvrouBi8ykcsOd1vCpnd6TuBeqRMeI45P9UCnfKUYyEw5OnuOC0fc0ArvM61xYc5ohHbUcgrdah2GVx9Y6vfE+nsir7Sk95veSGvt7KI26LRzMmriXTZc4tPxWvGxbRZ4GS4ttW6nW36iZVPpJm8Vh//Hsw+91GArOy8isjfbWGIe6qF3B0I9REnPNV6JuCd1pEoC2LLapbCHIJY252Z18G6n4EEZ870HCtLvXE6M2t7VpEsnLLcU5V0GxYRPgXbVFaf/2eEuyOQsEawQLPNUSSrUR+iARFkP7EN/ZGJ+HC6AIzs97g02mP8Y5mvgG14Y9GdMTUZRSKvZro8v4/iYxQeVfYcwThy99UAdgjaTbgUWknJ4jAEU72Fcc+mroTWFvk673suv1eabvCInO5s4xjFQTcLx28qf4Pk4Wg/PIg/v2eknDmzefVFDkpyHYHvEJ/wyOyM X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(376002)(346002)(366004)(39860400002)(396003)(451199021)(41300700001)(5660300002)(7416002)(110136005)(316002)(2906002)(8676002)(8936002)(66899021)(6512007)(6486002)(4326008)(66556008)(66476007)(66946007)(6666004)(52116002)(36756003)(478600001)(186003)(86362001)(38100700002)(38350700002)(2616005)(83380400001)(26005)(6506007)(1076003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TVs+iFl6xRLKk7+cbGsv95uCfomV8fLK65gUTsSgv4hnzflCUw7eq3jKwzw2a3tapY4ED3cySLIhOcwXIyfHHWmAi/Nx9CGD2K1HjjM94y35pCKEyhT5NfohQaDfEnV5LlOk8RopeOKNZPV1DZBYTm3Un/1NJScWGymRkU+5s2Z+P3L5idzvHSfVcZEbOly/VmRkOVFdFCOQTm65m5qL011V5kBYVXXEuj3+XMLZeb/ffngq7Tw0W0mRFWGrfhFWTxTTGUnvwbED6eKK+UvAsIvYMBghDe7psHUbLHxk2GyycHykSqiofH7REPSECBrk79XTm8f67uquVrq2MsFIBO9QePLacI2xZf+NWQeTcK5KZNl18GcLp37TjUyNx1dts9A4w5Eo9KC+thaPA7R5wsHDEiG58GA63v55GbwAWJPJoXjbpdkVj8PSz/Xae6NC1aomRWwYha45eCjfAVBA8fSGoe0mhDfuldPT25tkeP28MYVw36VxwysAXf2zzMTpdANcy//M/8V9QVnZR03wOLQAMJdtgIF5AUSdOXq0g5Z4laKnijMR37itRKInkHU2MTSEhwpg0mm8nwe0UD5tQ0RF3IEPiB1ovY2Xa09hfF4mBUKnk6RraP9eRVBanYNH2u6BTIEGQwA1njAcPcCvfUP5/6uKwrNnBHulKE6XU1/UxyF7lMnEEZ1hf+UAz4x7/mdvn3mH+nN59j6h22jHcCEi4hS5x15Jf/2MJZUm7tLJKrswDayF3Cm2zlrUVLVzf188oVExZK44itQ0rhwJxGqx9zFs/nifhr0mw4/R9Na5a4cqbvETgqwfe8ohsoUWl3BMgSvgv/zep6iN8w35qYTV5gNXNQCF6/ioYpNe5UWi9JKO3p6Dv7cKSRdMmvwpta+4Ci3MCSiHdOxmdb3Gd6gp95Lq2rP3DfrAqAk7r+rYYujx1fuY+A7gsy9q2sCEZgsuNWbCBIbMshYjNUh7fWUnyF/kzXRNF8gjb+UEEejbWWnSFPAhsdgrjfcVdPxAbMTb09gqAQf8su3lGvAhlW3ukX2U3jWGcXHMExYjFm+U5Zz8nNtFKXyr1ivM/MUVWGnwGdCsmTNOfOcEOrfo1Rw2ptEfdK9Mr4bfwIml9G9oWvo6SZSmCDdaoiunGTK+/pAaCCkwxg9W+/h6XjWtnOMMaE8uvPCPnyl2o7zaEDjFYdeTmpwQB2zXcCy9QURCES/Pn0O46K8V+NtWwBPEodO0a+6m9pUf82p1Zc8QHd1lqFh88RmtxGRlwpcUyjQts+YaeLA1yZ/o1cyYKRfYbkWVQHMipbis1HgKuw0kcTdvzvgUXbIlBXJ8NXHimKaFhpV+vjEbGcsJ3dQ6D2B+CcuUY73KMy1MSYGFpoNNbbKPPlhDSHVVrCOPa6Rt1vmh0aNdGABfo8kxD0Jgaq/RZpzWu1yn8HSxPClCoT1LgEJjPI0RZ19LMmbUtzfxlzh0zs5fznOOmYLknup6XefnuUkyyXc08DPnfdCc8mSkj4eH6L/PORU9sHIrRKt0KV2wta9uCuvtBkdwYXn8h2+OlDz/K62MxviN+k8VjEhjTBq21yDOm9O3g8ulKCmQzeHB X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1314334-f83e-42dc-c20a-08db814867e1 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2023 13:20:18.4777 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QmOES3Wq5S78FLq7RoE0wG8oc48oAAD5UnoemoQdVHDs4UaI3MPnTPq9waxYs8vnojarPXX7dflAEQaSnbWcCg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB5930 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230710_062032_532637_802CF47E X-CRM114-Status: GOOD ( 10.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org These lables are redundant and don't do anything, let's remove it. Signed-off-by: Yangtao Li --- drivers/video/fbdev/imxfb.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c index 4582ea801121..77dedd2c05fd 100644 --- a/drivers/video/fbdev/imxfb.c +++ b/drivers/video/fbdev/imxfb.c @@ -903,7 +903,7 @@ static int imxfb_probe(struct platform_device *pdev) if (!display_np) { dev_err(&pdev->dev, "No display defined in devicetree\n"); ret = -EINVAL; - goto failed_of_parse; + goto failed_init; } /* @@ -917,13 +917,13 @@ static int imxfb_probe(struct platform_device *pdev) if (!fbi->mode) { ret = -ENOMEM; of_node_put(display_np); - goto failed_of_parse; + goto failed_init; } ret = imxfb_of_read_mode(&pdev->dev, display_np, fbi->mode); of_node_put(display_np); if (ret) - goto failed_of_parse; + goto failed_init; /* Calculate maximum bytes used per pixel. In most cases this should * be the same as m->bpp/8 */ @@ -936,7 +936,7 @@ static int imxfb_probe(struct platform_device *pdev) fbi->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); if (IS_ERR(fbi->clk_ipg)) { ret = PTR_ERR(fbi->clk_ipg); - goto failed_getclock; + goto failed_init; } /* @@ -951,25 +951,25 @@ static int imxfb_probe(struct platform_device *pdev) */ ret = clk_prepare_enable(fbi->clk_ipg); if (ret) - goto failed_getclock; + goto failed_init; clk_disable_unprepare(fbi->clk_ipg); fbi->clk_ahb = devm_clk_get(&pdev->dev, "ahb"); if (IS_ERR(fbi->clk_ahb)) { ret = PTR_ERR(fbi->clk_ahb); - goto failed_getclock; + goto failed_init; } fbi->clk_per = devm_clk_get(&pdev->dev, "per"); if (IS_ERR(fbi->clk_per)) { ret = PTR_ERR(fbi->clk_per); - goto failed_getclock; + goto failed_init; } fbi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(fbi->regs)) { ret = PTR_ERR(fbi->regs); - goto failed_ioremap; + goto failed_init; } fbi->map_size = PAGE_ALIGN(info->fix.smem_len); @@ -978,7 +978,7 @@ static int imxfb_probe(struct platform_device *pdev) if (!info->screen_buffer) { dev_err(&pdev->dev, "Failed to allocate video RAM\n"); ret = -ENOMEM; - goto failed_map; + goto failed_init; } info->fix.smem_start = fbi->map_dma; @@ -1030,16 +1030,11 @@ static int imxfb_probe(struct platform_device *pdev) failed_lcd: unregister_framebuffer(info); - failed_register: fb_dealloc_cmap(&info->cmap); failed_cmap: dma_free_wc(&pdev->dev, fbi->map_size, info->screen_buffer, fbi->map_dma); -failed_map: -failed_ioremap: -failed_getclock: -failed_of_parse: failed_init: framebuffer_release(info); return ret;