Skip to contentSkip to conversation

misc: tifm: remove unnecessary pci_set_drvdata()

PATCH New Jingoo Han 1 participant 4 messages Sep 23, 2013

Subsystems (3)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/4 misc: tifm: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.

---
 drivers/misc/tifm_7xx1.c |    3 ---
 1 file changed, 3 deletions(-)
drivers/misc/tifm_7xx1.c +0 -3
index f8d66543..ae282a1 100644
@@ -378,7 +378,6 @@ err_out_irq:
 err_out_unmap:
 	iounmap(fm->addr);
 err_out_free:
-	pci_set_drvdata(dev, NULL);
 	tifm_free_adapter(fm);
 err_out_int:
 	pci_intx(dev, 0);
@@ -405,8 +404,6 @@ static void tifm_7xx1_remove(struct pci_dev *dev)
 	for (cnt = 0; cnt < fm->num_sockets; cnt++)
 		tifm_7xx1_sock_power_off(tifm_7xx1_sock_addr(fm->addr, cnt));
 
-	pci_set_drvdata(dev, NULL);
-
 	iounmap(fm->addr);
 	pci_intx(dev, 0);
 	pci_release_regions(dev);
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/4 misc: ibmasm: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.

---
 drivers/misc/ibmasm/module.c |    2 --
 1 file changed, 2 deletions(-)
drivers/misc/ibmasm/module.c +0 -2
index 0346d87..c224039 100644
@@ -153,7 +153,6 @@ error_ioremap:
 error_heartbeat:
 	ibmasm_event_buffer_exit(sp);
 error_eventbuffer:
-	pci_set_drvdata(pdev, NULL);
 	kfree(sp);
 error_kmalloc:
         pci_release_regions(pdev);
@@ -182,7 +181,6 @@ static void ibmasm_remove_one(struct pci_dev *pdev)
 	ibmasm_free_remote_input_dev(sp);
 	iounmap(sp->base_address);
 	ibmasm_event_buffer_exit(sp);
-	pci_set_drvdata(pdev, NULL);
 	kfree(sp);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
Signature · 1 line
1.7.10.4
author
#2 lore raw

PATCH 3/4 misc: mei: remove unnecessary pci_set_drvdata()

In reply to Jingoo Han

The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.

---
 drivers/misc/mei/pci-me.c |    1 -
 1 file changed, 1 deletion(-)
drivers/misc/mei/pci-me.c +0 -1
index 1b3844e..1b8a4c6 100644
@@ -239,7 +239,6 @@ static void mei_me_remove(struct pci_dev *pdev)
 
 	free_irq(pdev->irq, dev);
 	pci_disable_msi(pdev);
-	pci_set_drvdata(pdev, NULL);
 
 	if (hw->mem_addr)
 		pci_iounmap(pdev, hw->mem_addr);
Signature · 1 line
1.7.10.4
author
#3 lore raw

PATCH 4/4 misc: pti: remove unnecessary pci_set_drvdata()

In reply to Jingoo Han

The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.

---
 drivers/misc/pti.c |    1 -
 1 file changed, 1 deletion(-)
drivers/misc/pti.c +0 -1
index f84ff0c..eda38cb 100644
@@ -892,7 +892,6 @@ static void pti_pci_remove(struct pci_dev *pdev)
 	}
 
 	iounmap(drv_data->pti_ioaddr);
-	pci_set_drvdata(pdev, NULL);
 	kfree(drv_data);
 	pci_release_region(pdev, 1);
 	pci_disable_device(pdev);
Signature · 1 line
1.7.10.4