isa: Remove unnecessary checks

Vlad4896 · gregkh · commit 6bea9ea6bb21 · 2023-05-31T19:03:39.000+01:00
The isa_dev->dev.platform_data is initialized with incoming parameter isa_driver. After it isa_dev->dev.platform_data is checked for NULL, but incoming parameter isa_driver is not NULL since it is dereferenced many times before this check. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Vladislav Efanov <VEfanov@ispras.ru> Acked-by: William Breathitt Gray <william.gray@linaro.org> Link: https://lore.kernel.org/r/20230517125025.434005-1-VEfanov@ispras.ru Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/base/isa.c b/drivers/base/isa.c
@@ -149,11 +149,8 @@ int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)
 			break;
 		}
 
-		if (isa_dev->dev.platform_data) {
-			isa_dev->next = isa_driver->devices;
-			isa_driver->devices = &isa_dev->dev;
-		} else
-			device_unregister(&isa_dev->dev);
+		isa_dev->next = isa_driver->devices;
+		isa_driver->devices = &isa_dev->dev;
 	}
 
 	if (!error && !isa_driver->devices)

Original file line number	Diff line number	Diff line change
`@@ -149,11 +149,8 @@ int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)`
`149`	`149`	`break;`
`150`	`150`	`}`
`151`	`151`
`152`		`- if (isa_dev->dev.platform_data) {`
`153`		`- isa_dev->next = isa_driver->devices;`
`154`		`- isa_driver->devices = &isa_dev->dev;`
`155`		`- } else`
`156`		`- device_unregister(&isa_dev->dev);`
	`152`	`+ isa_dev->next = isa_driver->devices;`
	`153`	`+ isa_driver->devices = &isa_dev->dev;`
`157`	`154`	`}`
`158`	`155`
`159`	`156`	`if (!error && !isa_driver->devices)`