Commit 74e7cd43 authored by Brandon Stewart's avatar Brandon Stewart Committed by Benjamin Herrenschmidt

macintosh/adb: Fixed some coding style problems

Signed-off-by: default avatarBrandon Stewart <stewartb2@gmail.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9ac8cde9
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/machdep.h> #include <asm/machdep.h>
...@@ -193,8 +193,7 @@ static int adb_scan_bus(void) ...@@ -193,8 +193,7 @@ static int adb_scan_bus(void)
break; break;
noMovement = 0; noMovement = 0;
} } else {
else {
/* /*
* No devices left at address i; move the * No devices left at address i; move the
* one(s) we moved to `highFree' back to i. * one(s) we moved to `highFree' back to i.
...@@ -502,7 +501,7 @@ void ...@@ -502,7 +501,7 @@ void
adb_input(unsigned char *buf, int nb, int autopoll) adb_input(unsigned char *buf, int nb, int autopoll)
{ {
int i, id; int i, id;
static int dump_adb_input = 0; static int dump_adb_input;
unsigned long flags; unsigned long flags;
void (*handler)(unsigned char *, int, int); void (*handler)(unsigned char *, int, int);
...@@ -624,8 +623,7 @@ do_adb_query(struct adb_request *req) ...@@ -624,8 +623,7 @@ do_adb_query(struct adb_request *req)
{ {
int ret = -EINVAL; int ret = -EINVAL;
switch(req->data[1]) switch(req->data[1]) {
{
case ADB_QUERY_GETDEVINFO: case ADB_QUERY_GETDEVINFO:
if (req->nbytes < 3) if (req->nbytes < 3)
break; break;
...@@ -697,7 +695,7 @@ static ssize_t adb_read(struct file *file, char __user *buf, ...@@ -697,7 +695,7 @@ static ssize_t adb_read(struct file *file, char __user *buf,
int ret = 0; int ret = 0;
struct adbdev_state *state = file->private_data; struct adbdev_state *state = file->private_data;
struct adb_request *req; struct adb_request *req;
DECLARE_WAITQUEUE(wait,current); DECLARE_WAITQUEUE(wait, current);
unsigned long flags; unsigned long flags;
if (count < 2) if (count < 2)
...@@ -794,8 +792,8 @@ static ssize_t adb_write(struct file *file, const char __user *buf, ...@@ -794,8 +792,8 @@ static ssize_t adb_write(struct file *file, const char __user *buf,
} }
/* Special case for ADB_BUSRESET request, all others are sent to /* Special case for ADB_BUSRESET request, all others are sent to
the controller */ the controller */
else if ((req->data[0] == ADB_PACKET)&&(count > 1) else if ((req->data[0] == ADB_PACKET) && (count > 1)
&&(req->data[1] == ADB_BUSRESET)) { && (req->data[1] == ADB_BUSRESET)) {
ret = do_adb_reset_bus(); ret = do_adb_reset_bus();
up(&adb_probe_mutex); up(&adb_probe_mutex);
atomic_dec(&state->n_pending); atomic_dec(&state->n_pending);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment