diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-07-16 18:28:20 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-16 10:19:55 -0700 |
| commit | b8d1f261fe7e4967593a5637d62991b6197a03f8 (patch) | |
| tree | 76dded46020fbe6eb696e02b46aeaa4712529b5b | |
| parent | 174b83c0eb577d7db8f1867f1d76dc14f0b8eb40 (diff) | |
| download | linux-stable-b8d1f261fe7e4967593a5637d62991b6197a03f8.tar.gz linux-stable-b8d1f261fe7e4967593a5637d62991b6197a03f8.tar.bz2 linux-stable-b8d1f261fe7e4967593a5637d62991b6197a03f8.zip | |
staging: dgap: remove duplicate code
Remove the duplicate code of dgap_remove_one() and dgap_stop().
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/dgap/dgap.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 4f07a0cae987..b344e035b0ef 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -7024,22 +7024,9 @@ static void dgap_stop(bool removesys, struct pci_driver *drv) static void dgap_remove_one(struct pci_dev *dev) { unsigned int i; - ulong lock_flags; struct pci_driver *drv = to_pci_driver(dev->dev.driver); - spin_lock_irqsave(&dgap_poll_lock, lock_flags); - dgap_poll_stop = 1; - spin_unlock_irqrestore(&dgap_poll_lock, lock_flags); - - /* Turn off poller right away. */ - del_timer_sync(&dgap_poll_timer); - - dgap_remove_driver_sysfiles(drv); - - device_destroy(dgap_class, MKDEV(DIGI_DGAP_MAJOR, 0)); - class_destroy(dgap_class); - unregister_chrdev(DIGI_DGAP_MAJOR, "dgap"); - + dgap_stop(true, drv); for (i = 0; i < dgap_numboards; ++i) { dgap_remove_ports_sysfiles(dgap_board[i]); dgap_cleanup_tty(dgap_board[i]); |