[patch 1/4] IBMASM: whitespace cleanup

From: Dmitry Torokhov
Date: Tue May 15 2007 - 00:18:33 EST

IBMASM: whitespace cleanup

Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
---

drivers/misc/ibmasm/command.c | 14 +++++++-------
drivers/misc/ibmasm/dot_command.c | 10 +++++-----
drivers/misc/ibmasm/dot_command.h | 2 +-
drivers/misc/ibmasm/event.c | 8 ++++----
drivers/misc/ibmasm/heartbeat.c | 2 +-
drivers/misc/ibmasm/i2o.h | 10 +++++-----
drivers/misc/ibmasm/ibmasm.h | 6 +++---
drivers/misc/ibmasm/ibmasmfs.c | 24 ++++++++++++------------
drivers/misc/ibmasm/lowlevel.c | 2 +-
drivers/misc/ibmasm/lowlevel.h | 16 ++++++++--------
drivers/misc/ibmasm/module.c | 10 +++++-----
drivers/misc/ibmasm/r_heartbeat.c | 10 +++++-----
drivers/misc/ibmasm/remote.h | 8 ++++----
drivers/misc/ibmasm/uart.c | 2 +-
14 files changed, 62 insertions(+), 62 deletions(-)

Index: work/drivers/misc/ibmasm/command.c
===================================================================
--- work.orig/drivers/misc/ibmasm/command.c
+++ work/drivers/misc/ibmasm/command.c
@@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

@@ -72,7 +72,7 @@ struct command *ibmasm_new_command(struc
static void free_command(struct kobject *kobj)
{
struct command *cmd = to_command(kobj);
-
+
list_del(&cmd->queue_node);
atomic_dec(&command_count);
dbg("command count: %d\n", atomic_read(&command_count));
@@ -113,14 +113,14 @@ static inline void do_exec_command(struc
exec_next_command(sp);
}
}
-
+
/**
* exec_command
* send a command to a service processor
* Commands are executed sequentially. One command (sp->current_command)
* is sent to the service processor. Once the interrupt handler gets a
* message of type command_response, the message is copied into
- * the current commands buffer,
+ * the current commands buffer,
*/
void ibmasm_exec_command(struct service_processor *sp, struct command *cmd)
{
@@ -160,7 +160,7 @@ static void exec_next_command(struct ser
}
}

-/**
+/**
* Sleep until a command has failed or a response has been received
* and the command status been updated by the interrupt handler.
* (see receive_response).
@@ -182,8 +182,8 @@ void ibmasm_receive_command_response(str
{
struct command *cmd = sp->current_command;

- if (!sp->current_command)
- return;
+ if (!sp->current_command)
+ return;

memcpy_fromio(cmd->buffer, response, min(size, cmd->buffer_size));
cmd->status = IBMASM_CMD_COMPLETE;
Index: work/drivers/misc/ibmasm/dot_command.c
===================================================================
--- work.orig/drivers/misc/ibmasm/dot_command.c
+++ work/drivers/misc/ibmasm/dot_command.c
@@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

@@ -44,11 +44,11 @@ void ibmasm_receive_message(struct servi
size = message_size;

switch (header->type) {
- case sp_event:
+ case sp_event:
ibmasm_receive_event(sp, message, size);
break;
case sp_command_response:
- ibmasm_receive_command_response(sp, message, size);
+ ibmasm_receive_command_response(sp, message, size);
break;
case sp_heartbeat:
ibmasm_receive_heartbeat(sp, message, size);
@@ -95,7 +95,7 @@ int ibmasm_send_driver_vpd(struct servic
strcat(vpd_data, IBMASM_DRIVER_VPD);
vpd_data[10] = 0;
vpd_data[15] = 0;
-
+
ibmasm_exec_command(sp, command);
ibmasm_wait_for_response(command, IBMASM_CMD_TIMEOUT_NORMAL);

@@ -118,7 +118,7 @@ struct os_state_command {
* During driver init this function is called with os state "up".
* This causes the service processor to start sending heartbeats the
* driver.
- * During driver exit the function is called with os state "down",
+ * During driver exit the function is called with os state "down",
* causing the service processor to stop the heartbeats.
*/
int ibmasm_send_os_state(struct service_processor *sp, int os_state)
Index: work/drivers/misc/ibmasm/dot_command.h
===================================================================
--- work.orig/drivers/misc/ibmasm/dot_command.h
+++ work/drivers/misc/ibmasm/dot_command.h
@@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

Index: work/drivers/misc/ibmasm/event.c
===================================================================
--- work.orig/drivers/misc/ibmasm/event.c
+++ work/drivers/misc/ibmasm/event.c
@@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

@@ -51,7 +51,7 @@ static void wake_up_event_readers(struct
* event readers.
* There is no reader marker in the buffer, therefore readers are
* responsible for keeping up with the writer, or they will loose events.
- */
+ */
void ibmasm_receive_event(struct service_processor *sp, void *data, unsigned int data_size)
{
struct event_buffer *buffer = sp->event_buffer;
@@ -77,13 +77,13 @@ void ibmasm_receive_event(struct service

static inline int event_available(struct event_buffer *b, struct event_reader *r)
{
- return (r->next_serial_number < b->next_serial_number);
+ return (r->next_serial_number < b->next_serial_number);
}

/**
* get_next_event
* Called by event readers (initiated from user space through the file
- * system).
+ * system).
* Sleeps until a new event is available.
*/
int ibmasm_get_next_event(struct service_processor *sp, struct event_reader *reader)
Index: work/drivers/misc/ibmasm/heartbeat.c
===================================================================
--- work.orig/drivers/misc/ibmasm/heartbeat.c
+++ work/drivers/misc/ibmasm/heartbeat.c
@@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

Index: work/drivers/misc/ibmasm/i2o.h
===================================================================
--- work.orig/drivers/misc/ibmasm/i2o.h
+++ work/drivers/misc/ibmasm/i2o.h
@@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

@@ -26,9 +26,9 @@ struct i2o_header {
u8 version;
u8 message_flags;
u16 message_size;
- u8 target;
+ u8 target;
u8 initiator_and_target;
- u8 initiator;
+ u8 initiator;
u8 function;
u32 initiator_context;
};
@@ -64,12 +64,12 @@ static inline unsigned short outgoing_me
size = sizeof(struct i2o_header) + data_size;

i2o_size = size / sizeof(u32);
-
+
if (size % sizeof(u32))
i2o_size++;

return i2o_size;
-}
+}

static inline u32 incoming_data_size(struct i2o_message *i2o_message)
{
Index: work/drivers/misc/ibmasm/ibmasm.h
===================================================================
--- work.orig/drivers/misc/ibmasm/ibmasm.h
+++ work/drivers/misc/ibmasm/ibmasm.h
@@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

@@ -58,8 +58,8 @@ static inline char *get_timestamp(char *
return buf;
}

-#define IBMASM_CMD_PENDING 0
-#define IBMASM_CMD_COMPLETE 1
+#define IBMASM_CMD_PENDING 0
+#define IBMASM_CMD_COMPLETE 1
#define IBMASM_CMD_FAILED 2

#define IBMASM_CMD_TIMEOUT_NORMAL 45
Index: work/drivers/misc/ibmasm/ibmasmfs.c
===================================================================
--- work.orig/drivers/misc/ibmasm/ibmasmfs.c
+++ work/drivers/misc/ibmasm/ibmasmfs.c
@@ -17,12 +17,12 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

/*
- * Parts of this code are based on an article by Jonathan Corbet
+ * Parts of this code are based on an article by Jonathan Corbet
* that appeared in Linux Weekly News.
*/

@@ -55,22 +55,22 @@
* For each service processor the following files are created:
*
* command: execute dot commands
- * write: execute a dot command on the service processor
- * read: return the result of a previously executed dot command
+ * write: execute a dot command on the service processor
+ * read: return the result of a previously executed dot command
*
* events: listen for service processor events
- * read: sleep (interruptible) until an event occurs
+ * read: sleep (interruptible) until an event occurs
* write: wakeup sleeping event listener
*
* reverse_heartbeat: send a heartbeat to the service processor
- * read: sleep (interruptible) until the reverse heartbeat fails
+ * read: sleep (interruptible) until the reverse heartbeat fails
* write: wakeup sleeping heartbeat listener
*
* remote_video/width
* remote_video/height
* remote_video/width: control remote display settings
- * write: set value
- * read: read value
+ * write: set value
+ * read: read value
*/

#include <linux/fs.h>
@@ -155,7 +155,7 @@ static struct inode *ibmasmfs_make_inode

static struct dentry *ibmasmfs_create_file (struct super_block *sb,
struct dentry *parent,
- const char *name,
+ const char *name,
const struct file_operations *fops,
void *data,
int mode)
@@ -261,7 +261,7 @@ static int command_file_close(struct ino
struct ibmasmfs_command_data *command_data = file->private_data;

if (command_data->command)
- command_put(command_data->command);
+ command_put(command_data->command);

kfree(command_data);
return 0;
@@ -348,7 +348,7 @@ static ssize_t command_file_write(struct
static int event_file_open(struct inode *inode, struct file *file)
{
struct ibmasmfs_event_data *event_data;
- struct service_processor *sp;
+ struct service_processor *sp;

if (!inode->i_private)
return -ENODEV;
@@ -573,7 +573,7 @@ static ssize_t remote_settings_file_writ
kfree(buff);
return -EFAULT;
}
-
+
value = simple_strtoul(buff, NULL, 10);
writel(value, address);
kfree(buff);
Index: work/drivers/misc/ibmasm/lowlevel.c
===================================================================
--- work.orig/drivers/misc/ibmasm/lowlevel.c
+++ work/drivers/misc/ibmasm/lowlevel.c
@@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

Index: work/drivers/misc/ibmasm/lowlevel.h
===================================================================
--- work.orig/drivers/misc/ibmasm/lowlevel.h
+++ work/drivers/misc/ibmasm/lowlevel.h
@@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

@@ -48,9 +48,9 @@
#define INTR_CONTROL_REGISTER 0x13A4

#define SCOUT_COM_A_BASE 0x0000
-#define SCOUT_COM_B_BASE 0x0100
-#define SCOUT_COM_C_BASE 0x0200
-#define SCOUT_COM_D_BASE 0x0300
+#define SCOUT_COM_B_BASE 0x0100
+#define SCOUT_COM_C_BASE 0x0200
+#define SCOUT_COM_D_BASE 0x0300

static inline int sp_interrupt_pending(void __iomem *base_address)
{
@@ -86,12 +86,12 @@ static inline void disable_sp_interrupts

static inline void enable_uart_interrupts(void __iomem *base_address)
{
- ibmasm_enable_interrupts(base_address, UART_INTR_MASK);
+ ibmasm_enable_interrupts(base_address, UART_INTR_MASK);
}

static inline void disable_uart_interrupts(void __iomem *base_address)
{
- ibmasm_disable_interrupts(base_address, UART_INTR_MASK);
+ ibmasm_disable_interrupts(base_address, UART_INTR_MASK);
}

#define valid_mfa(mfa) ( (mfa) != NO_MFAS_AVAILABLE )
@@ -111,7 +111,7 @@ static inline u32 get_mfa_outbound(void

static inline void set_mfa_outbound(void __iomem *base_address, u32 mfa)
{
- writel(mfa, base_address + OUTBOUND_QUEUE_PORT);
+ writel(mfa, base_address + OUTBOUND_QUEUE_PORT);
}

static inline u32 get_mfa_inbound(void __iomem *base_address)
@@ -126,7 +126,7 @@ static inline u32 get_mfa_inbound(void _

static inline void set_mfa_inbound(void __iomem *base_address, u32 mfa)
{
- writel(mfa, base_address + INBOUND_QUEUE_PORT);
+ writel(mfa, base_address + INBOUND_QUEUE_PORT);
}

static inline struct i2o_message *get_i2o_message(void __iomem *base_address, u32 mfa)
Index: work/drivers/misc/ibmasm/module.c
===================================================================
--- work.orig/drivers/misc/ibmasm/module.c
+++ work/drivers/misc/ibmasm/module.c
@@ -18,9 +18,9 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
- * This driver is based on code originally written by Pete Reynolds
+ * This driver is based on code originally written by Pete Reynolds
* and others.
*
*/
@@ -30,13 +30,13 @@
*
* 1) When loaded it sends a message to the service processor,
* indicating that an OS is * running. This causes the service processor
- * to send periodic heartbeats to the OS.
+ * to send periodic heartbeats to the OS.
*
* 2) Answers the periodic heartbeats sent by the service processor.
* Failure to do so would result in system reboot.
*
* 3) Acts as a pass through for dot commands sent from user applications.
- * The interface for this is the ibmasmfs file system.
+ * The interface for this is the ibmasmfs file system.
*
* 4) Allows user applications to register for event notification. Events
* are sent to the driver through interrupts. They can be read from user
@@ -105,7 +105,7 @@ static int __devinit ibmasm_init_one(str
}

sp->irq = pdev->irq;
- sp->base_address = ioremap(pci_resource_start(pdev, 0),
+ sp->base_address = ioremap(pci_resource_start(pdev, 0),
pci_resource_len(pdev, 0));
if (sp->base_address == 0) {
dev_err(sp->dev, "Failed to ioremap pci memory\n");
Index: work/drivers/misc/ibmasm/r_heartbeat.c
===================================================================
--- work.orig/drivers/misc/ibmasm/r_heartbeat.c
+++ work/drivers/misc/ibmasm/r_heartbeat.c
@@ -16,7 +16,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

@@ -36,10 +36,10 @@ static struct {
unsigned char command[3];
} rhb_dot_cmd = {
.header = {
- .type = sp_read,
+ .type = sp_read,
.command_size = 3,
.data_size = 0,
- .status = 0
+ .status = 0
},
.command = { 4, 3, 6 }
};
@@ -76,9 +76,9 @@ int ibmasm_start_reverse_heartbeat(struc
if (cmd->status != IBMASM_CMD_COMPLETE)
times_failed++;

- wait_event_interruptible_timeout(rhb->wait,
+ wait_event_interruptible_timeout(rhb->wait,
rhb->stopped,
- REVERSE_HEARTBEAT_TIMEOUT * HZ);
+ REVERSE_HEARTBEAT_TIMEOUT * HZ);

if (signal_pending(current) || rhb->stopped) {
result = -EINTR;
Index: work/drivers/misc/ibmasm/remote.h
===================================================================
--- work.orig/drivers/misc/ibmasm/remote.h
+++ work/drivers/misc/ibmasm/remote.h
@@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
* Orignally written by Pete Reynolds
*/
@@ -73,7 +73,7 @@ struct keyboard_input {



-struct remote_input {
+struct remote_input {
union {
struct mouse_input mouse;
struct keyboard_input keyboard;
@@ -85,7 +85,7 @@ struct remote_input {
unsigned char pad3;
};

-#define mouse_addr(sp) (sp->base_address + CONDOR_MOUSE_DATA)
+#define mouse_addr(sp) (sp->base_address + CONDOR_MOUSE_DATA)
#define display_width(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESX)
#define display_height(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESY)
#define display_depth(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_BITS)
@@ -93,7 +93,7 @@ struct remote_input {
#define vnc_status(sp) (mouse_addr(sp) + CONDOR_OUTPUT_VNC_STATUS)
#define isr_control(sp) (mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)

-#define mouse_interrupt_pending(sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS)
+#define mouse_interrupt_pending(sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS)
#define clear_mouse_interrupt(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS)
#define enable_mouse_interrupts(sp) writel(1, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)
#define disable_mouse_interrupts(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)
Index: work/drivers/misc/ibmasm/uart.c
===================================================================
--- work.orig/drivers/misc/ibmasm/uart.c
+++ work/drivers/misc/ibmasm/uart.c
@@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
- * Author: Max Asböck <amax@xxxxxxxxxx>
+ * Author: Max Asböck <amax@xxxxxxxxxx>
*
*/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/