summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hounschell <markh@compro.net>2014-03-12 12:50:54 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-17 14:35:43 -0700
commitb2e78c24408cd353919fb35e7f582a592f3b852d (patch)
treee6ab4f911cca2a7978842cca580b2a3fd85659c4
parent74f71e7175a2be070cba5f055fdd2ee9c8f17b8b (diff)
staging: dgap: remove unused brd->state states
This patch removes unused brd->state states previously used in the userland firmware download process. Signed-off-by: Mark Hounschell <markh@compro.net> Tested-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/dgap/dgap.c5
-rw-r--r--drivers/staging/dgap/dgap.h17
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 2fe949996cd1..c2b2d8fce349 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 a6738f105732..02d267f87d02 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
};