Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

IBMASM: whitespace cleanup

IBMASM: whitespace cleanup

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Cc: Vernon Mauery <vernux@us.ibm.com>
Cc: Max Asbock <masbock@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Dmitry Torokhov and committed by
Linus Torvalds
3110dc7a 567f3e42

+62 -62
+7 -7
drivers/misc/ibmasm/command.c
··· 18 18 * 19 19 * Copyright (C) IBM Corporation, 2004 20 20 * 21 - * Author: Max Asb�ck <amax@us.ibm.com> 21 + * Author: Max Asb�ck <amax@us.ibm.com> 22 22 * 23 23 */ 24 24 ··· 72 72 static void free_command(struct kobject *kobj) 73 73 { 74 74 struct command *cmd = to_command(kobj); 75 - 75 + 76 76 list_del(&cmd->queue_node); 77 77 atomic_dec(&command_count); 78 78 dbg("command count: %d\n", atomic_read(&command_count)); ··· 113 113 exec_next_command(sp); 114 114 } 115 115 } 116 - 116 + 117 117 /** 118 118 * exec_command 119 119 * send a command to a service processor 120 120 * Commands are executed sequentially. One command (sp->current_command) 121 121 * is sent to the service processor. Once the interrupt handler gets a 122 122 * message of type command_response, the message is copied into 123 - * the current commands buffer, 123 + * the current commands buffer, 124 124 */ 125 125 void ibmasm_exec_command(struct service_processor *sp, struct command *cmd) 126 126 { ··· 160 160 } 161 161 } 162 162 163 - /** 163 + /** 164 164 * Sleep until a command has failed or a response has been received 165 165 * and the command status been updated by the interrupt handler. 166 166 * (see receive_response). ··· 182 182 { 183 183 struct command *cmd = sp->current_command; 184 184 185 - if (!sp->current_command) 186 - return; 185 + if (!sp->current_command) 186 + return; 187 187 188 188 memcpy_fromio(cmd->buffer, response, min(size, cmd->buffer_size)); 189 189 cmd->status = IBMASM_CMD_COMPLETE;
+5 -5
drivers/misc/ibmasm/dot_command.c
··· 17 17 * 18 18 * Copyright (C) IBM Corporation, 2004 19 19 * 20 - * Author: Max Asb�ck <amax@us.ibm.com> 20 + * Author: Max Asb�ck <amax@us.ibm.com> 21 21 * 22 22 */ 23 23 ··· 44 44 size = message_size; 45 45 46 46 switch (header->type) { 47 - case sp_event: 47 + case sp_event: 48 48 ibmasm_receive_event(sp, message, size); 49 49 break; 50 50 case sp_command_response: 51 - ibmasm_receive_command_response(sp, message, size); 51 + ibmasm_receive_command_response(sp, message, size); 52 52 break; 53 53 case sp_heartbeat: 54 54 ibmasm_receive_heartbeat(sp, message, size); ··· 95 95 strcat(vpd_data, IBMASM_DRIVER_VPD); 96 96 vpd_data[10] = 0; 97 97 vpd_data[15] = 0; 98 - 98 + 99 99 ibmasm_exec_command(sp, command); 100 100 ibmasm_wait_for_response(command, IBMASM_CMD_TIMEOUT_NORMAL); 101 101 ··· 118 118 * During driver init this function is called with os state "up". 119 119 * This causes the service processor to start sending heartbeats the 120 120 * driver. 121 - * During driver exit the function is called with os state "down", 121 + * During driver exit the function is called with os state "down", 122 122 * causing the service processor to stop the heartbeats. 123 123 */ 124 124 int ibmasm_send_os_state(struct service_processor *sp, int os_state)
+1 -1
drivers/misc/ibmasm/dot_command.h
··· 17 17 * 18 18 * Copyright (C) IBM Corporation, 2004 19 19 * 20 - * Author: Max Asb�ck <amax@us.ibm.com> 20 + * Author: Max Asb�ck <amax@us.ibm.com> 21 21 * 22 22 */ 23 23
+4 -4
drivers/misc/ibmasm/event.c
··· 18 18 * 19 19 * Copyright (C) IBM Corporation, 2004 20 20 * 21 - * Author: Max Asb�ck <amax@us.ibm.com> 21 + * Author: Max Asb�ck <amax@us.ibm.com> 22 22 * 23 23 */ 24 24 ··· 51 51 * event readers. 52 52 * There is no reader marker in the buffer, therefore readers are 53 53 * responsible for keeping up with the writer, or they will loose events. 54 - */ 54 + */ 55 55 void ibmasm_receive_event(struct service_processor *sp, void *data, unsigned int data_size) 56 56 { 57 57 struct event_buffer *buffer = sp->event_buffer; ··· 77 77 78 78 static inline int event_available(struct event_buffer *b, struct event_reader *r) 79 79 { 80 - return (r->next_serial_number < b->next_serial_number); 80 + return (r->next_serial_number < b->next_serial_number); 81 81 } 82 82 83 83 /** 84 84 * get_next_event 85 85 * Called by event readers (initiated from user space through the file 86 - * system). 86 + * system). 87 87 * Sleeps until a new event is available. 88 88 */ 89 89 int ibmasm_get_next_event(struct service_processor *sp, struct event_reader *reader)
+1 -1
drivers/misc/ibmasm/heartbeat.c
··· 18 18 * 19 19 * Copyright (C) IBM Corporation, 2004 20 20 * 21 - * Author: Max Asb�ck <amax@us.ibm.com> 21 + * Author: Max Asb�ck <amax@us.ibm.com> 22 22 * 23 23 */ 24 24
+5 -5
drivers/misc/ibmasm/i2o.h
··· 17 17 * 18 18 * Copyright (C) IBM Corporation, 2004 19 19 * 20 - * Author: Max Asb�ck <amax@us.ibm.com> 20 + * Author: Max Asb�ck <amax@us.ibm.com> 21 21 * 22 22 */ 23 23 ··· 26 26 u8 version; 27 27 u8 message_flags; 28 28 u16 message_size; 29 - u8 target; 29 + u8 target; 30 30 u8 initiator_and_target; 31 - u8 initiator; 31 + u8 initiator; 32 32 u8 function; 33 33 u32 initiator_context; 34 34 }; ··· 64 64 size = sizeof(struct i2o_header) + data_size; 65 65 66 66 i2o_size = size / sizeof(u32); 67 - 67 + 68 68 if (size % sizeof(u32)) 69 69 i2o_size++; 70 70 71 71 return i2o_size; 72 - } 72 + } 73 73 74 74 static inline u32 incoming_data_size(struct i2o_message *i2o_message) 75 75 {
+3 -3
drivers/misc/ibmasm/ibmasm.h
··· 18 18 * 19 19 * Copyright (C) IBM Corporation, 2004 20 20 * 21 - * Author: Max Asb�ck <amax@us.ibm.com> 21 + * Author: Max Asb�ck <amax@us.ibm.com> 22 22 * 23 23 */ 24 24 ··· 58 58 return buf; 59 59 } 60 60 61 - #define IBMASM_CMD_PENDING 0 62 - #define IBMASM_CMD_COMPLETE 1 61 + #define IBMASM_CMD_PENDING 0 62 + #define IBMASM_CMD_COMPLETE 1 63 63 #define IBMASM_CMD_FAILED 2 64 64 65 65 #define IBMASM_CMD_TIMEOUT_NORMAL 45
+12 -12
drivers/misc/ibmasm/ibmasmfs.c
··· 17 17 * 18 18 * Copyright (C) IBM Corporation, 2004 19 19 * 20 - * Author: Max Asb�ck <amax@us.ibm.com> 20 + * Author: Max Asb�ck <amax@us.ibm.com> 21 21 * 22 22 */ 23 23 24 24 /* 25 - * Parts of this code are based on an article by Jonathan Corbet 25 + * Parts of this code are based on an article by Jonathan Corbet 26 26 * that appeared in Linux Weekly News. 27 27 */ 28 28 ··· 55 55 * For each service processor the following files are created: 56 56 * 57 57 * command: execute dot commands 58 - * write: execute a dot command on the service processor 59 - * read: return the result of a previously executed dot command 58 + * write: execute a dot command on the service processor 59 + * read: return the result of a previously executed dot command 60 60 * 61 61 * events: listen for service processor events 62 - * read: sleep (interruptible) until an event occurs 62 + * read: sleep (interruptible) until an event occurs 63 63 * write: wakeup sleeping event listener 64 64 * 65 65 * reverse_heartbeat: send a heartbeat to the service processor 66 - * read: sleep (interruptible) until the reverse heartbeat fails 66 + * read: sleep (interruptible) until the reverse heartbeat fails 67 67 * write: wakeup sleeping heartbeat listener 68 68 * 69 69 * remote_video/width 70 70 * remote_video/height 71 71 * remote_video/width: control remote display settings 72 - * write: set value 73 - * read: read value 72 + * write: set value 73 + * read: read value 74 74 */ 75 75 76 76 #include <linux/fs.h> ··· 155 155 156 156 static struct dentry *ibmasmfs_create_file (struct super_block *sb, 157 157 struct dentry *parent, 158 - const char *name, 158 + const char *name, 159 159 const struct file_operations *fops, 160 160 void *data, 161 161 int mode) ··· 261 261 struct ibmasmfs_command_data *command_data = file->private_data; 262 262 263 263 if (command_data->command) 264 - command_put(command_data->command); 264 + command_put(command_data->command); 265 265 266 266 kfree(command_data); 267 267 return 0; ··· 348 348 static int event_file_open(struct inode *inode, struct file *file) 349 349 { 350 350 struct ibmasmfs_event_data *event_data; 351 - struct service_processor *sp; 351 + struct service_processor *sp; 352 352 353 353 if (!inode->i_private) 354 354 return -ENODEV; ··· 573 573 kfree(buff); 574 574 return -EFAULT; 575 575 } 576 - 576 + 577 577 value = simple_strtoul(buff, NULL, 10); 578 578 writel(value, address); 579 579 kfree(buff);
+1 -1
drivers/misc/ibmasm/lowlevel.c
··· 17 17 * 18 18 * Copyright (C) IBM Corporation, 2004 19 19 * 20 - * Author: Max Asb�ck <amax@us.ibm.com> 20 + * Author: Max Asb�ck <amax@us.ibm.com> 21 21 * 22 22 */ 23 23
+8 -8
drivers/misc/ibmasm/lowlevel.h
··· 17 17 * 18 18 * Copyright (C) IBM Corporation, 2004 19 19 * 20 - * Author: Max Asb�ck <amax@us.ibm.com> 20 + * Author: Max Asb�ck <amax@us.ibm.com> 21 21 * 22 22 */ 23 23 ··· 48 48 #define INTR_CONTROL_REGISTER 0x13A4 49 49 50 50 #define SCOUT_COM_A_BASE 0x0000 51 - #define SCOUT_COM_B_BASE 0x0100 52 - #define SCOUT_COM_C_BASE 0x0200 53 - #define SCOUT_COM_D_BASE 0x0300 51 + #define SCOUT_COM_B_BASE 0x0100 52 + #define SCOUT_COM_C_BASE 0x0200 53 + #define SCOUT_COM_D_BASE 0x0300 54 54 55 55 static inline int sp_interrupt_pending(void __iomem *base_address) 56 56 { ··· 86 86 87 87 static inline void enable_uart_interrupts(void __iomem *base_address) 88 88 { 89 - ibmasm_enable_interrupts(base_address, UART_INTR_MASK); 89 + ibmasm_enable_interrupts(base_address, UART_INTR_MASK); 90 90 } 91 91 92 92 static inline void disable_uart_interrupts(void __iomem *base_address) 93 93 { 94 - ibmasm_disable_interrupts(base_address, UART_INTR_MASK); 94 + ibmasm_disable_interrupts(base_address, UART_INTR_MASK); 95 95 } 96 96 97 97 #define valid_mfa(mfa) ( (mfa) != NO_MFAS_AVAILABLE ) ··· 111 111 112 112 static inline void set_mfa_outbound(void __iomem *base_address, u32 mfa) 113 113 { 114 - writel(mfa, base_address + OUTBOUND_QUEUE_PORT); 114 + writel(mfa, base_address + OUTBOUND_QUEUE_PORT); 115 115 } 116 116 117 117 static inline u32 get_mfa_inbound(void __iomem *base_address) ··· 126 126 127 127 static inline void set_mfa_inbound(void __iomem *base_address, u32 mfa) 128 128 { 129 - writel(mfa, base_address + INBOUND_QUEUE_PORT); 129 + writel(mfa, base_address + INBOUND_QUEUE_PORT); 130 130 } 131 131 132 132 static inline struct i2o_message *get_i2o_message(void __iomem *base_address, u32 mfa)
+5 -5
drivers/misc/ibmasm/module.c
··· 18 18 * 19 19 * Copyright (C) IBM Corporation, 2004 20 20 * 21 - * Author: Max Asb�ck <amax@us.ibm.com> 21 + * Author: Max Asb�ck <amax@us.ibm.com> 22 22 * 23 - * This driver is based on code originally written by Pete Reynolds 23 + * This driver is based on code originally written by Pete Reynolds 24 24 * and others. 25 25 * 26 26 */ ··· 30 30 * 31 31 * 1) When loaded it sends a message to the service processor, 32 32 * indicating that an OS is * running. This causes the service processor 33 - * to send periodic heartbeats to the OS. 33 + * to send periodic heartbeats to the OS. 34 34 * 35 35 * 2) Answers the periodic heartbeats sent by the service processor. 36 36 * Failure to do so would result in system reboot. 37 37 * 38 38 * 3) Acts as a pass through for dot commands sent from user applications. 39 - * The interface for this is the ibmasmfs file system. 39 + * The interface for this is the ibmasmfs file system. 40 40 * 41 41 * 4) Allows user applications to register for event notification. Events 42 42 * are sent to the driver through interrupts. They can be read from user ··· 105 105 } 106 106 107 107 sp->irq = pdev->irq; 108 - sp->base_address = ioremap(pci_resource_start(pdev, 0), 108 + sp->base_address = ioremap(pci_resource_start(pdev, 0), 109 109 pci_resource_len(pdev, 0)); 110 110 if (sp->base_address == 0) { 111 111 dev_err(sp->dev, "Failed to ioremap pci memory\n");
+5 -5
drivers/misc/ibmasm/r_heartbeat.c
··· 16 16 * 17 17 * Copyright (C) IBM Corporation, 2004 18 18 * 19 - * Author: Max Asb�ck <amax@us.ibm.com> 19 + * Author: Max Asb�ck <amax@us.ibm.com> 20 20 * 21 21 */ 22 22 ··· 36 36 unsigned char command[3]; 37 37 } rhb_dot_cmd = { 38 38 .header = { 39 - .type = sp_read, 39 + .type = sp_read, 40 40 .command_size = 3, 41 41 .data_size = 0, 42 - .status = 0 42 + .status = 0 43 43 }, 44 44 .command = { 4, 3, 6 } 45 45 }; ··· 76 76 if (cmd->status != IBMASM_CMD_COMPLETE) 77 77 times_failed++; 78 78 79 - wait_event_interruptible_timeout(rhb->wait, 79 + wait_event_interruptible_timeout(rhb->wait, 80 80 rhb->stopped, 81 - REVERSE_HEARTBEAT_TIMEOUT * HZ); 81 + REVERSE_HEARTBEAT_TIMEOUT * HZ); 82 82 83 83 if (signal_pending(current) || rhb->stopped) { 84 84 result = -EINTR;
+4 -4
drivers/misc/ibmasm/remote.h
··· 18 18 * 19 19 * Copyright (C) IBM Corporation, 2004 20 20 * 21 - * Author: Max Asb�ck <amax@us.ibm.com> 21 + * Author: Max Asb�ck <amax@us.ibm.com> 22 22 * 23 23 * Orignally written by Pete Reynolds 24 24 */ ··· 73 73 74 74 75 75 76 - struct remote_input { 76 + struct remote_input { 77 77 union { 78 78 struct mouse_input mouse; 79 79 struct keyboard_input keyboard; ··· 85 85 unsigned char pad3; 86 86 }; 87 87 88 - #define mouse_addr(sp) (sp->base_address + CONDOR_MOUSE_DATA) 88 + #define mouse_addr(sp) (sp->base_address + CONDOR_MOUSE_DATA) 89 89 #define display_width(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESX) 90 90 #define display_height(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESY) 91 91 #define display_depth(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_BITS) ··· 93 93 #define vnc_status(sp) (mouse_addr(sp) + CONDOR_OUTPUT_VNC_STATUS) 94 94 #define isr_control(sp) (mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL) 95 95 96 - #define mouse_interrupt_pending(sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS) 96 + #define mouse_interrupt_pending(sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS) 97 97 #define clear_mouse_interrupt(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS) 98 98 #define enable_mouse_interrupts(sp) writel(1, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL) 99 99 #define disable_mouse_interrupts(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)
+1 -1
drivers/misc/ibmasm/uart.c
··· 18 18 * 19 19 * Copyright (C) IBM Corporation, 2004 20 20 * 21 - * Author: Max Asb�ck <amax@us.ibm.com> 21 + * Author: Max Asb�ck <amax@us.ibm.com> 22 22 * 23 23 */ 24 24