[PATCH] w1: matrox: Remove some deadcode in matrox_w1_remove()

[PATCH] w1: matrox: Remove some deadcode in matrox_w1_remove()

[Christophe JAILLET]

The .remove function can only be called if the .probe() succeeds. So there
is no need to keep track of a successful probe in 'found'.

Simplify code accordingly.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only
---
 drivers/w1/masters/matrox_w1.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index 2852cd2dc67c..146fa7c6e74e 100644
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -47,7 +47,6 @@ struct matrox_device {
 
 	unsigned long phys_addr;
 	void __iomem *virt_addr;
-	unsigned long found;
 
 	struct w1_bus_master *bus_master;
 };
@@ -158,8 +157,6 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent
 
 	pci_set_drvdata(pdev, dev);
 
-	dev->found = 1;
-
 	dev_info(&pdev->dev, "Matrox G400 GPIO transport layer for 1-wire.\n");
 
 	return 0;
@@ -176,10 +173,9 @@ static void matrox_w1_remove(struct pci_dev *pdev)
 {
 	struct matrox_device *dev = pci_get_drvdata(pdev);
 
-	if (dev->found) {
-		w1_remove_master_device(dev->bus_master);
-		iounmap(dev->virt_addr);
-	}
+	w1_remove_master_device(dev->bus_master);
+	iounmap(dev->virt_addr);
+
 	kfree(dev);
 }
 
-- 
2.50.1

Re: [PATCH] w1: matrox: Remove some deadcode in matrox_w1_remove()

[Krzysztof Kozlowski]

On 21/08/2025 12:02, Christophe JAILLET wrote:
> The .remove function can only be called if the .probe() succeeds. So there
> is no need to keep track of a successful probe in 'found'.
> 
> Simplify code accordingly.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Compile tested only
> ---
>  drivers/w1/masters/matrox_w1.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
> index 2852cd2dc67c..146fa7c6e74e 100644
> --- a/drivers/w1/masters/matrox_w1.c
> +++ b/drivers/w1/masters/matrox_w1.c
> @@ -47,7 +47,6 @@ struct matrox_device {
>  
>  	unsigned long phys_addr;
>  	void __iomem *virt_addr;
> -	unsigned long found;
>  
>  	struct w1_bus_master *bus_master;
>  };
> @@ -158,8 +157,6 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent
>  
>  	pci_set_drvdata(pdev, dev);
>  
> -	dev->found = 1;

What wonderful code was this... Good catch, I'll apply it soon.

Best regards,
Krzysztof

Re: [PATCH] w1: matrox: Remove some deadcode in matrox_w1_remove()

[Krzysztof Kozlowski]

On Thu, 21 Aug 2025 12:02:21 +0200, Christophe JAILLET wrote:
> The .remove function can only be called if the .probe() succeeds. So there
> is no need to keep track of a successful probe in 'found'.
> 
> Simplify code accordingly.
> 
> 

Applied, thanks!

[1/1] w1: matrox: Remove some deadcode in matrox_w1_remove()
      https://git.kernel.org/krzk/linux-w1/c/25fb0ea986dc10e05f3f4b43cabde4d1853a1fd7

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>