Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp4121493rwb; Sat, 10 Dec 2022 03:58:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf61og0iYUo70Mo1xq9dh1EJEVHjyTFPx/OevLHbGqp+6FbsKNxMu1Cvvv66hCG2V5CAAWy6 X-Received: by 2002:a17:906:17c9:b0:7c0:bc68:bfc4 with SMTP id u9-20020a17090617c900b007c0bc68bfc4mr8083227eje.16.1670673509842; Sat, 10 Dec 2022 03:58:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670673509; cv=none; d=google.com; s=arc-20160816; b=w77uMzgf3qkh9rsKEeG3smgjqzztQ3k03fz0ooW/XnBJqfZ4JYnwdYyU8SzLJwC5Xs RG0jnMbTSsk8fG732sA/9vKEKkz7nUzMfxj8VTnx99SElXhz5UkHe2s4hKiuJZAw1RTD s1nSAKDeqBxkkblNpEHuXCyCxu1blpyf+9Uzn3gAxZsJ7b74kGT3Ddvh8ZneebpK2Ey2 UHpW7VboMI0e0zWQ/J4Qrqg3bZrbEyHTsBY6EKutirASOb/vaROxlXOfUWTAFWXm0XuI ddflRNbnQtj6dGi8/c8bHzzvQTbxPJwKsPWvbpgqEuLrct1PTAMnyZLsdV0YqihZsiCi anZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=V9xgqpNbpYuaedL71SkHn1jJh+MD74J2lR1hFciej0w=; b=pX/QaRZTgalnhbz64J9fdjIY8ZRXyNgPAIbzC7UJI7bFDXMx98aoQPvmd+Re+i906S C6+tWv2kRaDg8v2jY8322b8VifAB4yUKEj0Y1GdcBr7CtZXA78TNUyoG2gBiEUjfUd7E EWOwot+wL+TIR4gKTegL3BqZXOj32OcR5IlnRlD1j7oKZfxwUbvHIEmgmHMFFVKo/PGr MFh1whprFtLvLESx0/t4YoUyKn5/RsPNnNvtjI+QuCm+bcZjSh997zdtB4316Rub+1JH 1gyKfChhmNTViYMwzvmz3h1/6Po1IlZaZN3SlvdilOvlLSp7UwGo4n3nIy6t4VezWt4N n86Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kf27-20020a17090776db00b007ae286f26b1si1710552ejc.620.2022.12.10.03.58.12; Sat, 10 Dec 2022 03:58:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229777AbiLJLfi (ORCPT + 74 others); Sat, 10 Dec 2022 06:35:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbiLJLfh (ORCPT ); Sat, 10 Dec 2022 06:35:37 -0500 Received: from smtp.smtpout.orange.fr (smtp-14.smtpout.orange.fr [80.12.242.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DE121FCFF for ; Sat, 10 Dec 2022 03:35:35 -0800 (PST) Received: from pop-os.home ([86.243.100.34]) by smtp.orange.fr with ESMTPA id 3y8gpaJiRNF1W3y8jp0xrl; Sat, 10 Dec 2022 12:35:33 +0100 X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 10 Dec 2022 12:35:33 +0100 X-ME-IP: 86.243.100.34 From: Christophe JAILLET To: Michal Januszewski , Helge Deller Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/2] video: fbdev: uvesafb: Simplify uvesafb_remove() Date: Sat, 10 Dec 2022 12:35:23 +0100 Message-Id: <72b61f099e846dbb16c13ffb50c877ed196a308f.1670671944.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <0eba6acb70fa1270d8cf798afd11ce342aa7e8e1.1670671944.git.christophe.jaillet@wanadoo.fr> References: <0eba6acb70fa1270d8cf798afd11ce342aa7e8e1.1670671944.git.christophe.jaillet@wanadoo.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the remove() function is called, we know that the probe() function has successfully been executed. So 'info' is known to be not NULL. Simplify the code accordingly. Signed-off-by: Christophe JAILLET --- Change in v2: - new patch --- drivers/video/fbdev/uvesafb.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c index 0e3cabbec4b4..2bb95c35ab2a 100644 --- a/drivers/video/fbdev/uvesafb.c +++ b/drivers/video/fbdev/uvesafb.c @@ -1777,25 +1777,23 @@ static int uvesafb_probe(struct platform_device *dev) static int uvesafb_remove(struct platform_device *dev) { struct fb_info *info = platform_get_drvdata(dev); + struct uvesafb_par *par = info->par; - if (info) { - struct uvesafb_par *par = info->par; + sysfs_remove_group(&dev->dev.kobj, &uvesafb_dev_attgrp); + unregister_framebuffer(info); + release_region(0x3c0, 32); + iounmap(info->screen_base); + arch_phys_wc_del(par->mtrr_handle); + release_mem_region(info->fix.smem_start, info->fix.smem_len); + fb_destroy_modedb(info->monspecs.modedb); + fb_dealloc_cmap(&info->cmap); - sysfs_remove_group(&dev->dev.kobj, &uvesafb_dev_attgrp); - unregister_framebuffer(info); - release_region(0x3c0, 32); - iounmap(info->screen_base); - arch_phys_wc_del(par->mtrr_handle); - release_mem_region(info->fix.smem_start, info->fix.smem_len); - fb_destroy_modedb(info->monspecs.modedb); - fb_dealloc_cmap(&info->cmap); + kfree(par->vbe_modes); + kfree(par->vbe_state_orig); + kfree(par->vbe_state_saved); - kfree(par->vbe_modes); - kfree(par->vbe_state_orig); - kfree(par->vbe_state_saved); + framebuffer_release(info); - framebuffer_release(info); - } return 0; } -- 2.34.1