Commit e92b13a2a28224dcd9d9bd8cb3d0fcbe9d3060d9
2013-04-26T12:21:25
Use a separate function for bfl initialise that doesn't require locking.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
diff --git a/driver-bflsc.c b/driver-bflsc.c
index 4091480..61bbb02 100644
--- a/driver-bflsc.c
+++ b/driver-bflsc.c
@@ -459,7 +459,7 @@ static void xlinkstr(char *xlink, int dev, struct bflsc_info *sc_info)
}
}
-static void bflsc_initialise(struct cgpu_info *bflsc, bool lock)
+static void __bflsc_initialise(struct cgpu_info *bflsc)
{
int err;
@@ -468,11 +468,8 @@ static void bflsc_initialise(struct cgpu_info *bflsc, bool lock)
// TODO: does x-link bypass the other device FTDI? (I think it does)
// So no initialisation required except for the master device?
- if (lock)
- mutex_lock(&(bflsc->device_mutex));
-
if (bflsc->usbinfo.nodev)
- goto failed;
+ return;
// Reset
err = usb_transfer(bflsc, FTDI_TYPE_OUT, FTDI_REQUEST_RESET,
@@ -482,7 +479,7 @@ static void bflsc_initialise(struct cgpu_info *bflsc, bool lock)
bflsc->drv->name, bflsc->device_id, err);
if (bflsc->usbinfo.nodev)
- goto failed;
+ return;
// Set data control
err = usb_transfer(bflsc, FTDI_TYPE_OUT, FTDI_REQUEST_DATA,
@@ -492,7 +489,7 @@ static void bflsc_initialise(struct cgpu_info *bflsc, bool lock)
bflsc->drv->name, bflsc->device_id, err);
if (bflsc->usbinfo.nodev)
- goto failed;
+ return;
// Set the baud
err = usb_transfer(bflsc, FTDI_TYPE_OUT, FTDI_REQUEST_BAUD, FTDI_VALUE_BAUD,
@@ -503,7 +500,7 @@ static void bflsc_initialise(struct cgpu_info *bflsc, bool lock)
bflsc->drv->name, bflsc->device_id, err);
if (bflsc->usbinfo.nodev)
- goto failed;
+ return;
// Set Flow Control
err = usb_transfer(bflsc, FTDI_TYPE_OUT, FTDI_REQUEST_FLOW,
@@ -513,7 +510,7 @@ static void bflsc_initialise(struct cgpu_info *bflsc, bool lock)
bflsc->drv->name, bflsc->device_id, err);
if (bflsc->usbinfo.nodev)
- goto failed;
+ return;
// Set Modem Control
err = usb_transfer(bflsc, FTDI_TYPE_OUT, FTDI_REQUEST_MODEM,
@@ -523,7 +520,7 @@ static void bflsc_initialise(struct cgpu_info *bflsc, bool lock)
bflsc->drv->name, bflsc->device_id, err);
if (bflsc->usbinfo.nodev)
- goto failed;
+ return;
// Clear any sent data
err = usb_transfer(bflsc, FTDI_TYPE_OUT, FTDI_REQUEST_RESET,
@@ -533,7 +530,7 @@ static void bflsc_initialise(struct cgpu_info *bflsc, bool lock)
bflsc->drv->name, bflsc->device_id, err);
if (bflsc->usbinfo.nodev)
- goto failed;
+ return;
// Clear any received data
err = usb_transfer(bflsc, FTDI_TYPE_OUT, FTDI_REQUEST_RESET,
@@ -542,10 +539,13 @@ static void bflsc_initialise(struct cgpu_info *bflsc, bool lock)
applog(LOG_DEBUG, "%s%i: purgerx got err %d",
bflsc->drv->name, bflsc->device_id, err);
-failed:
+}
- if (lock)
- mutex_unlock(&(bflsc->device_mutex));
+static void bflsc_initialise(struct cgpu_info *bflsc)
+{
+ mutex_lock(&(bflsc->device_mutex));
+ bflsc_initialise(bflsc);
+ mutex_unlock(&(bflsc->device_mutex));
}
static int write_to_dev(struct cgpu_info *bflsc, int dev, char *buf, int buflen, int *amount, enum usb_cmds cmd)
@@ -690,7 +690,7 @@ retry:
init_sleep = REINIT_TIME_FIRST_MS;
gettimeofday(&init_start, NULL);
reinit:
- bflsc_initialise(bflsc, false);
+ __bflsc_initialise(bflsc);
err = write_to_dev(bflsc, 0, BFLSC_IDENTIFY, BFLSC_IDENTIFY_LEN, &amount, C_REQUESTIDENTIFY);
if (err < 0 || amount != BFLSC_IDENTIFY_LEN) {
applog(LOG_ERR, "%s detect (%s) send identify request failed (%d:%d)",
@@ -1313,7 +1313,7 @@ static void bflsc_thread_enable(struct thr_info *thr)
if (bflsc->usbinfo.nodev)
return;
- bflsc_initialise(bflsc, true);
+ bflsc_initialise(bflsc);
}
static bool bflsc_send_work(struct cgpu_info *bflsc, int dev, struct work *work)
@@ -1565,7 +1565,7 @@ static bool bflsc_thread_init(struct thr_info *thr)
if (bflsc->usbinfo.nodev)
return false;
- bflsc_initialise(bflsc, true);
+ bflsc_initialise(bflsc);
return true;
}