Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 74e7cd432c3d1641df4c88666cc427b03495673b

Authored by Brandon Stewart
Committed by Benjamin Herrenschmidt
1 parent 9ac8cde938
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

macintosh/adb: Fixed some coding style problems 

Signed-off-by: Brandon Stewart <stewartb2@gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 1 changed file with 7 additions and 9 deletions Side-by-side Diff

drivers/macintosh/adb.c
Diff comments   View file @ 74e7cd4
... ... @@ -38,7 +38,7 @@
38 38 #include <linux/platform_device.h>
39 39 #include <linux/mutex.h>
40 40  
41   -#include <asm/uaccess.h>
  41 +#include <linux/uaccess.h>
42 42 #ifdef CONFIG_PPC
43 43 #include <asm/prom.h>
44 44 #include <asm/machdep.h>
... ... @@ -193,8 +193,7 @@
193 193 break;
194 194  
195 195 noMovement = 0;
196   - }
197   - else {
  196 + } else {
198 197 /*
199 198 * No devices left at address i; move the
200 199 * one(s) we moved to `highFree' back to i.
... ... @@ -502,7 +501,7 @@
502 501 adb_input(unsigned char *buf, int nb, int autopoll)
503 502 {
504 503 int i, id;
505   - static int dump_adb_input = 0;
  504 + static int dump_adb_input;
506 505 unsigned long flags;
507 506  
508 507 void (*handler)(unsigned char *, int, int);
... ... @@ -624,8 +623,7 @@
624 623 {
625 624 int ret = -EINVAL;
626 625  
627   - switch(req->data[1])
628   - {
  626 + switch(req->data[1]) {
629 627 case ADB_QUERY_GETDEVINFO:
630 628 if (req->nbytes < 3)
631 629 break;
... ... @@ -697,7 +695,7 @@
697 695 int ret = 0;
698 696 struct adbdev_state *state = file->private_data;
699 697 struct adb_request *req;
700   - DECLARE_WAITQUEUE(wait,current);
  698 + DECLARE_WAITQUEUE(wait, current);
701 699 unsigned long flags;
702 700  
703 701 if (count < 2)
... ... @@ -794,8 +792,8 @@
794 792 }
795 793 /* Special case for ADB_BUSRESET request, all others are sent to
796 794 the controller */
797   - else if ((req->data[0] == ADB_PACKET)&&(count > 1)
798   - &&(req->data[1] == ADB_BUSRESET)) {
  795 + else if ((req->data[0] == ADB_PACKET) && (count > 1)
  796 + && (req->data[1] == ADB_BUSRESET)) {
799 797 ret = do_adb_reset_bus();
800 798 up(&adb_probe_mutex);
801 799 atomic_dec(&state->n_pending);