diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2017-01-01 01:56:26 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-07 06:56:17 +0100 |
| commit | 06d7e99408acd2faa099d8af1a57cb1f6624062a (patch) | |
| tree | 5c2aef0c19b278c9a5ee79889fdca0eb3816fddc | |
| parent | via-cuda: Cleanup printk calls (diff) | |
| download | linux-06d7e99408acd2faa099d8af1a57cb1f6624062a.tar.xz linux-06d7e99408acd2faa099d8af1a57cb1f6624062a.zip | |
via-cuda: Remove redundant temporary variable
There is no possibility that current_req can change during execution of
cuda_start(). This can be confirmed by inspection: cuda_lock is always
held whenever cuda_start() is called or current_req is modified.
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | drivers/macintosh/via-cuda.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c index 06175126c986..dd51df5a6ec0 100644 --- a/drivers/macintosh/via-cuda.c +++ b/drivers/macintosh/via-cuda.c @@ -414,19 +414,15 @@ cuda_write(struct adb_request *req) static void cuda_start(void) { - struct adb_request *req; - /* assert cuda_state == idle */ - /* get the packet to send */ - req = current_req; - if (req == 0) + if (current_req == NULL) return; if ((in_8(&via[B]) & TREQ) == 0) return; /* a byte is coming in from the CUDA */ /* set the shift register to shift out and send a byte */ out_8(&via[ACR], in_8(&via[ACR]) | SR_OUT); - out_8(&via[SR], req->data[0]); + out_8(&via[SR], current_req->data[0]); out_8(&via[B], in_8(&via[B]) & ~TIP); cuda_state = sent_first_byte; } |