diff options
| author | Konrad Zapalowicz <bergo.torino@gmail.com> | 2014-08-06 16:21:22 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-16 23:23:13 +0400 |
| commit | bbecbacbed32db649c10d1d4e0a6045b4f4d4750 (patch) | |
| tree | 29f50a449281b030fcd3decd266a076e5d89dce3 | |
| parent | ea6e9dea2e72a7abd146a2c5bab726b27f34b36c (diff) | |
| download | linux-bbecbacbed32db649c10d1d4e0a6045b4f4d4750.tar.xz | |
staging: dgnc: Remove unnecessary functions from dgnc_driver.c
This commit slightly cleans up the dgnc_driver.c file. The changes
include removing one-line proxy functions as they were not needed.
Additionaly the pci 'remove' function is deleted because it was no
need for it.
Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/dgnc/dgnc_driver.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c index ec7dcb02f3c2..96108e2ee69f 100644 --- a/drivers/staging/dgnc/dgnc_driver.c +++ b/drivers/staging/dgnc/dgnc_driver.c @@ -70,14 +70,9 @@ static void dgnc_init_globals(void); static int dgnc_found_board(struct pci_dev *pdev, int id); static void dgnc_cleanup_board(struct dgnc_board *brd); static void dgnc_poll_handler(ulong dummy); -static int dgnc_init_pci(void); static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); -static void dgnc_remove_one(struct pci_dev *dev); -static int dgnc_probe1(struct pci_dev *pdev, int card_type); static void dgnc_do_remap(struct dgnc_board *brd); - - /* * File operations permitted on Control/Management major. */ @@ -170,7 +165,6 @@ static struct pci_driver dgnc_driver = { .name = "dgnc", .probe = dgnc_init_one, .id_table = dgnc_pci_tbl, - .remove = dgnc_remove_one, }; @@ -252,7 +246,7 @@ static int __init dgnc_init_module(void) /* * Find and configure all the cards */ - rc = dgnc_init_pci(); + rc = pci_register_driver(&dgnc_driver); /* * If something went wrong in the scan, bail out of driver. @@ -346,15 +340,6 @@ static int dgnc_start(void) return rc; } -/* - * Register pci driver, and return how many boards we have. - */ -static int dgnc_init_pci(void) -{ - return pci_register_driver(&dgnc_driver); -} - - /* returns count (>= 0), or negative on error */ static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -366,7 +351,7 @@ static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (rc < 0) { rc = -EIO; } else { - rc = dgnc_probe1(pdev, ent->driver_data); + rc = dgnc_found_board(pdev, ent->driver_data); if (rc == 0) { dgnc_NumBoards++; DPR_INIT(("Incrementing numboards to %d\n", dgnc_NumBoards)); @@ -375,17 +360,6 @@ static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return rc; } -static int dgnc_probe1(struct pci_dev *pdev, int card_type) -{ - return dgnc_found_board(pdev, card_type); -} - - -static void dgnc_remove_one(struct pci_dev *dev) -{ - /* Do Nothing */ -} - /* * dgnc_cleanup_board() * |