cdrom: Remove unnecessary NULL check before unregister_sysctl_table()

[PATCH] cdrom: Remove unnecessary NULL check before unregister_sysctl_table()

Posted by Chen Ni 9 months ago

unregister_sysctl_table() checks for NULL pointers internally.
Remove unneeded NULL check here.

Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
---
 drivers/cdrom/cdrom.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index b163e043c687..21a10552da61 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -3677,8 +3677,7 @@ static void cdrom_sysctl_register(void)
 
 static void cdrom_sysctl_unregister(void)
 {
-	if (cdrom_sysctl_header)
-		unregister_sysctl_table(cdrom_sysctl_header);
+	unregister_sysctl_table(cdrom_sysctl_header);
 }
 
 #else /* CONFIG_SYSCTL */
-- 
2.25.1

Re: [PATCH] cdrom: Remove unnecessary NULL check before unregister_sysctl_table()

Posted by Phillip Potter 8 months, 4 weeks ago

On Wed, May 14, 2025 at 11:21:39AM +0800, Chen Ni wrote:
> unregister_sysctl_table() checks for NULL pointers internally.
> Remove unneeded NULL check here.
> 
> Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
> ---
>  drivers/cdrom/cdrom.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
> index b163e043c687..21a10552da61 100644
> --- a/drivers/cdrom/cdrom.c
> +++ b/drivers/cdrom/cdrom.c
> @@ -3677,8 +3677,7 @@ static void cdrom_sysctl_register(void)
>  
>  static void cdrom_sysctl_unregister(void)
>  {
> -	if (cdrom_sysctl_header)
> -		unregister_sysctl_table(cdrom_sysctl_header);
> +	unregister_sysctl_table(cdrom_sysctl_header);
>  }
>  
>  #else /* CONFIG_SYSCTL */
> -- 
> 2.25.1
> 

Thank you for the patch, looks good.

Reviewed-by: Phillip Potter <phil@philpotter.co.uk>

I will send on for inclusion upstream.

Regards,
Phil