This patch removes unused brd->state states previously used in the userland firmware download process. Signed-off-by: Mark Hounschell <markh@xxxxxxxxxx> Tested-by: Mark Hounschell <markh@xxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/staging/dgap/dgap.c | 5 ----- drivers/staging/dgap/dgap.h | 17 ----------------- 2 files changed, 22 deletions(-) diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index b2089f5..fc42511 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -745,7 +745,6 @@ static int dgap_found_board(struct pci_dev *pdev, int id) spin_lock_init(&brd->bd_lock); - brd->state = BOARD_FOUND; brd->runwait = 0; brd->inhibit_poller = FALSE; brd->wait_for_bios = 0; @@ -820,8 +819,6 @@ static int dgap_found_board(struct pci_dev *pdev, int id) i = dgap_do_remap(brd); if (i) brd->state = BOARD_FAILED; - else - brd->state = NEED_RESET; return 0; } @@ -4550,8 +4547,6 @@ static void dgap_do_reset_board(struct board_t *brd) return; } - if (brd->state != BOARD_FAILED) - brd->state = FINISHED_RESET; } #ifdef DIGI_CONCENTRATORS_SUPPORTED diff --git a/drivers/staging/dgap/dgap.h b/drivers/staging/dgap/dgap.h index a6738f1..02d267f 100644 --- a/drivers/staging/dgap/dgap.h +++ b/drivers/staging/dgap/dgap.h @@ -487,25 +487,8 @@ enum { */ enum { BOARD_FAILED = 0, - CONFIG_NOT_FOUND, - BOARD_FOUND, - NEED_RESET, - FINISHED_RESET, - NEED_CONFIG, - FINISHED_CONFIG, - NEED_DEVICE_CREATION, - REQUESTED_DEVICE_CREATION, - FINISHED_DEVICE_CREATION, - NEED_BIOS_LOAD, - REQUESTED_BIOS, - WAIT_BIOS_LOAD, FINISHED_BIOS_LOAD, - NEED_FEP_LOAD, - REQUESTED_FEP, - WAIT_FEP_LOAD, FINISHED_FEP_LOAD, - NEED_PROC_CREATION, - FINISHED_PROC_CREATION, BOARD_READY }; -- 1.8.1.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel