Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

w1: matrox: Remove some deadcode in matrox_w1_remove()

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>
Link: https://lore.kernel.org/r/458641ad2d7a7adf30a03e70038304f0e6a81ff4.1755770484.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

authored by

Christophe JAILLET and committed by
Krzysztof Kozlowski
25fb0ea9 411053cb

+3 -7
+3 -7
drivers/w1/masters/matrox_w1.c
··· 47 47 48 48 unsigned long phys_addr; 49 49 void __iomem *virt_addr; 50 - unsigned long found; 51 50 52 51 struct w1_bus_master *bus_master; 53 52 }; ··· 157 158 158 159 pci_set_drvdata(pdev, dev); 159 160 160 - dev->found = 1; 161 - 162 161 dev_info(&pdev->dev, "Matrox G400 GPIO transport layer for 1-wire.\n"); 163 162 164 163 return 0; ··· 173 176 { 174 177 struct matrox_device *dev = pci_get_drvdata(pdev); 175 178 176 - if (dev->found) { 177 - w1_remove_master_device(dev->bus_master); 178 - iounmap(dev->virt_addr); 179 - } 179 + w1_remove_master_device(dev->bus_master); 180 + iounmap(dev->virt_addr); 181 + 180 182 kfree(dev); 181 183 } 182 184