|
@@ -153,8 +153,7 @@ struct board_id {
|
|
unsigned int is_pci_express;
|
|
unsigned int is_pci_express;
|
|
};
|
|
};
|
|
|
|
|
|
-static struct board_id dgnc_Ids[] =
|
|
|
|
-{
|
|
|
|
|
|
+static struct board_id dgnc_Ids[] = {
|
|
{ PCI_DEVICE_CLASSIC_4_PCI_NAME, 4, 0 },
|
|
{ PCI_DEVICE_CLASSIC_4_PCI_NAME, 4, 0 },
|
|
{ PCI_DEVICE_CLASSIC_4_422_PCI_NAME, 4, 0 },
|
|
{ PCI_DEVICE_CLASSIC_4_422_PCI_NAME, 4, 0 },
|
|
{ PCI_DEVICE_CLASSIC_8_PCI_NAME, 8, 0 },
|
|
{ PCI_DEVICE_CLASSIC_8_PCI_NAME, 8, 0 },
|
|
@@ -219,9 +218,8 @@ int dgnc_init_module(void)
|
|
*/
|
|
*/
|
|
rc = dgnc_start();
|
|
rc = dgnc_start();
|
|
|
|
|
|
- if (rc < 0) {
|
|
|
|
|
|
+ if (rc < 0)
|
|
return rc;
|
|
return rc;
|
|
- }
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
* Find and configure all the cards
|
|
* Find and configure all the cards
|
|
@@ -239,8 +237,7 @@ int dgnc_init_module(void)
|
|
pr_warn("WARNING: dgnc driver load failed. No Digi Neo or Classic boards found.\n");
|
|
pr_warn("WARNING: dgnc driver load failed. No Digi Neo or Classic boards found.\n");
|
|
|
|
|
|
dgnc_cleanup_module();
|
|
dgnc_cleanup_module();
|
|
- }
|
|
|
|
- else {
|
|
|
|
|
|
+ } else {
|
|
dgnc_create_driver_sysfiles(&dgnc_driver);
|
|
dgnc_create_driver_sysfiles(&dgnc_driver);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -519,9 +516,8 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
|
|
|
|
|
|
brd->state = BOARD_FOUND;
|
|
brd->state = BOARD_FOUND;
|
|
|
|
|
|
- for (i = 0; i < MAXPORTS; i++) {
|
|
|
|
|
|
+ for (i = 0; i < MAXPORTS; i++)
|
|
brd->channels[i] = NULL;
|
|
brd->channels[i] = NULL;
|
|
- }
|
|
|
|
|
|
|
|
/* store which card & revision we have */
|
|
/* store which card & revision we have */
|
|
pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &brd->subvendor);
|
|
pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &brd->subvendor);
|
|
@@ -802,9 +798,8 @@ static void dgnc_poll_handler(ulong dummy)
|
|
* driver tells us its up and running, and has
|
|
* driver tells us its up and running, and has
|
|
* everything it needs.
|
|
* everything it needs.
|
|
*/
|
|
*/
|
|
- if (dgnc_driver_state != DRIVER_READY) {
|
|
|
|
|
|
+ if (dgnc_driver_state != DRIVER_READY)
|
|
goto schedule_poller;
|
|
goto schedule_poller;
|
|
- }
|
|
|
|
|
|
|
|
/* Go thru each board, kicking off a tasklet for each if needed */
|
|
/* Go thru each board, kicking off a tasklet for each if needed */
|
|
for (i = 0; i < dgnc_NumBoards; i++) {
|
|
for (i = 0; i < dgnc_NumBoards; i++) {
|
|
@@ -834,9 +829,8 @@ schedule_poller:
|
|
|
|
|
|
new_time = dgnc_poll_time - jiffies;
|
|
new_time = dgnc_poll_time - jiffies;
|
|
|
|
|
|
- if ((ulong) new_time >= 2 * dgnc_poll_tick) {
|
|
|
|
|
|
+ if ((ulong) new_time >= 2 * dgnc_poll_tick)
|
|
dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick);
|
|
dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick);
|
|
- }
|
|
|
|
|
|
|
|
init_timer(&dgnc_poll_timer);
|
|
init_timer(&dgnc_poll_timer);
|
|
dgnc_poll_timer.function = dgnc_poll_handler;
|
|
dgnc_poll_timer.function = dgnc_poll_handler;
|
|
@@ -863,9 +857,8 @@ static void dgnc_init_globals(void)
|
|
dgnc_trcbuf_size = trcbuf_size;
|
|
dgnc_trcbuf_size = trcbuf_size;
|
|
dgnc_debug = debug;
|
|
dgnc_debug = debug;
|
|
|
|
|
|
- for (i = 0; i < MAXBOARDS; i++) {
|
|
|
|
|
|
+ for (i = 0; i < MAXBOARDS; i++)
|
|
dgnc_Board[i] = NULL;
|
|
dgnc_Board[i] = NULL;
|
|
- }
|
|
|
|
|
|
|
|
init_timer(&dgnc_poll_timer);
|
|
init_timer(&dgnc_poll_timer);
|
|
}
|
|
}
|