This is a patch that fixes the function declarations in visorbus/visorchipset.c by removing newlines after the function return type Signed-off-by: Wim de With <nauxuron@xxxxxxxxxxxxx> --- drivers/staging/unisys/visorbus/visorchipset.c | 225 ++++++++++--------------- 1 file changed, 85 insertions(+), 140 deletions(-) diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index ca22f49..f9192b6 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/staging/unisys/visorbus/visorchipset.c @@ -63,8 +63,7 @@ static int visorchipset_visorbusregwait = 1; /* default is on */ static int visorchipset_holdchipsetready; static unsigned long controlvm_payload_bytes_buffered; -static int -visorchipset_open(struct inode *inode, struct file *file) +static int visorchipset_open(struct inode *inode, struct file *file) { unsigned minor_number = iminor(inode); @@ -74,8 +73,7 @@ visorchipset_open(struct inode *inode, struct file *file) return 0; } -static int -visorchipset_release(struct inode *inode, struct file *file) +static int visorchipset_release(struct inode *inode, struct file *file) { return 0; } @@ -375,8 +373,8 @@ static void controlvm_respond_physdev_changestate( static void parser_done(struct parser_context *ctx); -static struct parser_context * -parser_init_byte_stream(u64 addr, u32 bytes, bool local, bool *retry) +static struct parser_context *parser_init_byte_stream(u64 addr, u32 bytes, + bool local, bool *retry) { int allocbytes = sizeof(struct parser_context) + bytes; struct parser_context *rc = NULL; @@ -451,8 +449,7 @@ cleanup: return rc; } -static uuid_le -parser_id_get(struct parser_context *ctx) +static uuid_le parser_id_get(struct parser_context *ctx) { struct spar_controlvm_parameters_header *phdr = NULL; @@ -473,8 +470,7 @@ enum PARSER_WHICH_STRING { PARSERSTRING_NAME, /* TODO: only PARSERSTRING_NAME is used ? */ }; -static void -parser_param_start(struct parser_context *ctx, +static void parser_param_start(struct parser_context *ctx, enum PARSER_WHICH_STRING which_string) { struct spar_controlvm_parameters_header *phdr = NULL; @@ -515,8 +511,7 @@ static void parser_done(struct parser_context *ctx) kfree(ctx); } -static void * -parser_string_get(struct parser_context *ctx) +static void *parser_string_get(struct parser_context *ctx) { u8 *pscan; unsigned long nscan; @@ -707,8 +702,7 @@ static ssize_t remaining_steps_store(struct device *dev, return count; } -static void -bus_info_clear(void *v) +static void bus_info_clear(void *v) { struct visorchipset_bus_info *p = (struct visorchipset_bus_info *) v; @@ -717,8 +711,7 @@ bus_info_clear(void *v) memset(p, 0, sizeof(struct visorchipset_bus_info)); } -static void -dev_info_clear(void *v) +static void dev_info_clear(void *v) { struct visorchipset_device_info *p = (struct visorchipset_device_info *) v; @@ -726,8 +719,8 @@ dev_info_clear(void *v) memset(p, 0, sizeof(struct visorchipset_device_info)); } -static struct visorchipset_bus_info * -bus_find(struct list_head *list, u32 bus_no) +static struct visorchipset_bus_info *bus_find(struct list_head *list, + u32 bus_no) { struct visorchipset_bus_info *p; @@ -739,8 +732,8 @@ bus_find(struct list_head *list, u32 bus_no) return NULL; } -static struct visorchipset_device_info * -device_find(struct list_head *list, u32 bus_no, u32 dev_no) +static struct visorchipset_device_info *device_find(struct list_head *list, + u32 bus_no, u32 dev_no) { struct visorchipset_device_info *p; @@ -764,8 +757,7 @@ static void busdevices_del(struct list_head *list, u32 bus_no) } } -static u8 -check_chipset_events(void) +static u8 check_chipset_events(void) { int i; u8 send_msg = 1; @@ -775,8 +767,7 @@ check_chipset_events(void) return send_msg; } -static void -clear_chipset_events(void) +static void clear_chipset_events(void) { int i; /* Clear chipset_events */ @@ -784,8 +775,7 @@ clear_chipset_events(void) chipset_events[i] = 0; } -void -visorchipset_register_busdev( +void visorchipset_register_busdev( struct visorchipset_busdev_notifiers *notifiers, struct visorchipset_busdev_responders *responders, struct ultra_vbus_deviceinfo *driver_info) @@ -809,8 +799,7 @@ visorchipset_register_busdev( } EXPORT_SYMBOL_GPL(visorchipset_register_busdev); -static void -cleanup_controlvm_structures(void) +static void cleanup_controlvm_structures(void) { struct visorchipset_bus_info *bi, *tmp_bi; struct visorchipset_device_info *di, *tmp_di; @@ -828,8 +817,7 @@ cleanup_controlvm_structures(void) } } -static void -chipset_init(struct controlvm_message *inmsg) +static void chipset_init(struct controlvm_message *inmsg) { static int chipset_inited; enum ultra_chipset_feature features = 0; @@ -860,8 +848,7 @@ cleanup: controlvm_respond_chipset_init(&inmsg->hdr, rc, features); } -static void -controlvm_init_response(struct controlvm_message *msg, +static void controlvm_init_response(struct controlvm_message *msg, struct controlvm_message_header *msg_hdr, int response) { memset(msg, 0, sizeof(struct controlvm_message)); @@ -875,8 +862,8 @@ controlvm_init_response(struct controlvm_message *msg, } } -static void -controlvm_respond(struct controlvm_message_header *msg_hdr, int response) +static void controlvm_respond(struct controlvm_message_header *msg_hdr, + int response) { struct controlvm_message outmsg; @@ -898,10 +885,10 @@ controlvm_respond(struct controlvm_message_header *msg_hdr, int response) } } -static void -controlvm_respond_chipset_init(struct controlvm_message_header *msg_hdr, - int response, - enum ultra_chipset_feature features) +static void controlvm_respond_chipset_init( + struct controlvm_message_header *msg_hdr, + int response, + enum ultra_chipset_feature features) { struct controlvm_message outmsg; @@ -933,8 +920,7 @@ enum crash_obj_type { CRASH_BUS, }; -void -visorchipset_save_message(struct controlvm_message *msg, +void visorchipset_save_message(struct controlvm_message *msg, enum crash_obj_type type) { u32 crash_msg_offset; @@ -989,8 +975,7 @@ visorchipset_save_message(struct controlvm_message *msg, } EXPORT_SYMBOL_GPL(visorchipset_save_message); -static void -bus_responder(enum controlvm_id cmd_id, u32 bus_no, int response) +static void bus_responder(enum controlvm_id cmd_id, u32 bus_no, int response) { struct visorchipset_bus_info *p; bool need_clear = false; @@ -1023,8 +1008,7 @@ bus_responder(enum controlvm_id cmd_id, u32 bus_no, int response) } } -static void -device_changestate_responder(enum controlvm_id cmd_id, +static void device_changestate_responder(enum controlvm_id cmd_id, u32 bus_no, u32 dev_no, int response, struct spar_segment_state response_state) { @@ -1052,8 +1036,8 @@ device_changestate_responder(enum controlvm_id cmd_id, p->pending_msg_hdr.id = CONTROLVM_INVALID; } -static void -device_responder(enum controlvm_id cmd_id, u32 bus_no, u32 dev_no, int response) +static void device_responder(enum controlvm_id cmd_id, u32 bus_no, u32 dev_no, + int response) { struct visorchipset_device_info *p; bool need_clear = false; @@ -1080,10 +1064,9 @@ device_responder(enum controlvm_id cmd_id, u32 bus_no, u32 dev_no, int response) dev_info_clear(p); } -static void -bus_epilog(u32 bus_no, - u32 cmd, struct controlvm_message_header *msg_hdr, - int response, bool need_response) +static void bus_epilog(u32 bus_no, u32 cmd, + struct controlvm_message_header *msg_hdr, + int response, bool need_response) { struct visorchipset_bus_info *bus_info; bool notified = false; @@ -1128,10 +1111,10 @@ bus_epilog(u32 bus_no, up(¬ifier_lock); } -static void -device_epilog(u32 bus_no, u32 dev_no, struct spar_segment_state state, u32 cmd, - struct controlvm_message_header *msg_hdr, int response, - bool need_response, bool for_visorbus) +static void device_epilog(u32 bus_no, u32 dev_no, + struct spar_segment_state state, u32 cmd, + struct controlvm_message_header *msg_hdr, int response, + bool need_response, bool for_visorbus) { struct visorchipset_busdev_notifiers *notifiers; bool notified = false; @@ -1223,8 +1206,7 @@ device_epilog(u32 bus_no, u32 dev_no, struct spar_segment_state state, u32 cmd, up(¬ifier_lock); } -static void -bus_create(struct controlvm_message *inmsg) +static void bus_create(struct controlvm_message *inmsg) { struct controlvm_message_packet *cmd = &inmsg->cmd; u32 bus_no = cmd->create_bus.bus_no; @@ -1272,8 +1254,7 @@ cleanup: rc, inmsg->hdr.flags.response_expected == 1); } -static void -bus_destroy(struct controlvm_message *inmsg) +static void bus_destroy(struct controlvm_message *inmsg) { struct controlvm_message_packet *cmd = &inmsg->cmd; u32 bus_no = cmd->destroy_bus.bus_no; @@ -1290,9 +1271,8 @@ bus_destroy(struct controlvm_message *inmsg) rc, inmsg->hdr.flags.response_expected == 1); } -static void -bus_configure(struct controlvm_message *inmsg, - struct parser_context *parser_ctx) +static void bus_configure(struct controlvm_message *inmsg, + struct parser_context *parser_ctx) { struct controlvm_message_packet *cmd = &inmsg->cmd; u32 bus_no; @@ -1331,8 +1311,7 @@ bus_configure(struct controlvm_message *inmsg, rc, inmsg->hdr.flags.response_expected == 1); } -static void -my_device_create(struct controlvm_message *inmsg) +static void my_device_create(struct controlvm_message *inmsg) { struct controlvm_message_packet *cmd = &inmsg->cmd; u32 bus_no = cmd->create_device.bus_no; @@ -1400,8 +1379,7 @@ cleanup: inmsg->hdr.flags.response_expected == 1, 1); } -static void -my_device_changestate(struct controlvm_message *inmsg) +static void my_device_changestate(struct controlvm_message *inmsg) { struct controlvm_message_packet *cmd = &inmsg->cmd; u32 bus_no = cmd->device_change_state.bus_no; @@ -1426,8 +1404,7 @@ my_device_changestate(struct controlvm_message *inmsg) inmsg->hdr.flags.response_expected == 1, 1); } -static void -my_device_destroy(struct controlvm_message *inmsg) +static void my_device_destroy(struct controlvm_message *inmsg) { struct controlvm_message_packet *cmd = &inmsg->cmd; u32 bus_no = cmd->destroy_device.bus_no; @@ -1453,9 +1430,8 @@ my_device_destroy(struct controlvm_message *inmsg) * controlvm_payload_info struct. Returns true for success or false * for failure. */ -static int -initialize_controlvm_payload_info(u64 phys_addr, u64 offset, u32 bytes, - struct visor_controlvm_payload_info *info) +static int initialize_controlvm_payload_info(u64 phys_addr, u64 offset, + u32 bytes, struct visor_controlvm_payload_info *info) { u8 __iomem *payload = NULL; int rc = CONTROLVM_RESP_SUCCESS; @@ -1489,8 +1465,8 @@ cleanup: return rc; } -static void -destroy_controlvm_payload_info(struct visor_controlvm_payload_info *info) +static void destroy_controlvm_payload_info( + struct visor_controlvm_payload_info *info) { if (info->ptr) { iounmap(info->ptr); @@ -1499,8 +1475,7 @@ destroy_controlvm_payload_info(struct visor_controlvm_payload_info *info) memset(info, 0, sizeof(struct visor_controlvm_payload_info)); } -static void -initialize_controlvm_payload(void) +static void initialize_controlvm_payload(void) { u64 phys_addr = visorchannel_get_physaddr(controlvm_channel); u64 payload_offset = 0; @@ -1530,16 +1505,14 @@ initialize_controlvm_payload(void) /* Send ACTION=online for DEVPATH=/sys/devices/platform/visorchipset. * Returns CONTROLVM_RESP_xxx code. */ -int -visorchipset_chipset_ready(void) +int visorchipset_chipset_ready(void) { kobject_uevent(&visorchipset_platform_device.dev.kobj, KOBJ_ONLINE); return CONTROLVM_RESP_SUCCESS; } EXPORT_SYMBOL_GPL(visorchipset_chipset_ready); -int -visorchipset_chipset_selftest(void) +int visorchipset_chipset_selftest(void) { char env_selftest[20]; char *envp[] = { env_selftest, NULL }; @@ -1554,16 +1527,14 @@ EXPORT_SYMBOL_GPL(visorchipset_chipset_selftest); /* Send ACTION=offline for DEVPATH=/sys/devices/platform/visorchipset. * Returns CONTROLVM_RESP_xxx code. */ -int -visorchipset_chipset_notready(void) +int visorchipset_chipset_notready(void) { kobject_uevent(&visorchipset_platform_device.dev.kobj, KOBJ_OFFLINE); return CONTROLVM_RESP_SUCCESS; } EXPORT_SYMBOL_GPL(visorchipset_chipset_notready); -static void -chipset_ready(struct controlvm_message_header *msg_hdr) +static void chipset_ready(struct controlvm_message_header *msg_hdr) { int rc = visorchipset_chipset_ready(); @@ -1579,8 +1550,7 @@ chipset_ready(struct controlvm_message_header *msg_hdr) } } -static void -chipset_selftest(struct controlvm_message_header *msg_hdr) +static void chipset_selftest(struct controlvm_message_header *msg_hdr) { int rc = visorchipset_chipset_selftest(); @@ -1590,8 +1560,7 @@ chipset_selftest(struct controlvm_message_header *msg_hdr) controlvm_respond(msg_hdr, rc); } -static void -chipset_notready(struct controlvm_message_header *msg_hdr) +static void chipset_notready(struct controlvm_message_header *msg_hdr) { int rc = visorchipset_chipset_notready(); @@ -1604,8 +1573,7 @@ chipset_notready(struct controlvm_message_header *msg_hdr) /* This is your "one-stop" shop for grabbing the next message from the * CONTROLVM_QUEUE_EVENT queue in the controlvm channel. */ -static bool -read_controlvm_event(struct controlvm_message *msg) +static bool read_controlvm_event(struct controlvm_message *msg) { if (visorchannel_signalremove(controlvm_channel, CONTROLVM_QUEUE_EVENT, msg)) { @@ -1636,8 +1604,7 @@ read_controlvm_event(struct controlvm_message *msg) * Generate unique int to match an outstanding CONTROLVM message with a * udev script /proc response */ -static int -parahotplug_next_id(void) +static int parahotplug_next_id(void) { static atomic_t id = ATOMIC_INIT(0); @@ -1648,8 +1615,7 @@ parahotplug_next_id(void) * Returns the time (in jiffies) when a CONTROLVM message on the list * should expire -- PARAHOTPLUG_TIMEOUT_MS in the future */ -static unsigned long -parahotplug_next_expiration(void) +static unsigned long parahotplug_next_expiration(void) { return jiffies + msecs_to_jiffies(PARAHOTPLUG_TIMEOUT_MS); } @@ -1658,8 +1624,8 @@ parahotplug_next_expiration(void) * Create a parahotplug_request, which is basically a wrapper for a * CONTROLVM_MESSAGE that we can stick on a list */ -static struct parahotplug_request * -parahotplug_request_create(struct controlvm_message *msg) +static struct parahotplug_request *parahotplug_request_create( + struct controlvm_message *msg) { struct parahotplug_request *req; @@ -1677,8 +1643,7 @@ parahotplug_request_create(struct controlvm_message *msg) /* * Free a parahotplug_request. */ -static void -parahotplug_request_destroy(struct parahotplug_request *req) +static void parahotplug_request_destroy(struct parahotplug_request *req) { kfree(req); } @@ -1688,8 +1653,7 @@ parahotplug_request_destroy(struct parahotplug_request *req) * specified in (the CONTROLVM message in) the specified * parahotplug_request */ -static void -parahotplug_request_kickoff(struct parahotplug_request *req) +static void parahotplug_request_kickoff(struct parahotplug_request *req) { struct controlvm_message_packet *cmd = &req->msg.cmd; char env_cmd[40], env_id[40], env_state[40], env_bus[40], env_dev[40], @@ -1717,8 +1681,7 @@ parahotplug_request_kickoff(struct parahotplug_request *req) * Remove any request from the list that's been on there too long and * respond with an error. */ -static void -parahotplug_process_list(void) +static void parahotplug_process_list(void) { struct list_head *pos; struct list_head *tmp; @@ -1749,8 +1712,7 @@ parahotplug_process_list(void) * finished the enable/disable. Find the matching identifier, and * respond to the CONTROLVM message with success. */ -static int -parahotplug_request_complete(int id, u16 active) +static int parahotplug_request_complete(int id, u16 active) { struct list_head *pos; struct list_head *tmp; @@ -1784,8 +1746,7 @@ parahotplug_request_complete(int id, u16 active) /* * Enables or disables a PCI device by kicking off a udev script */ -static void -parahotplug_process_message(struct controlvm_message *inmsg) +static void parahotplug_process_message(struct controlvm_message *inmsg) { struct parahotplug_request *req; @@ -1834,8 +1795,7 @@ parahotplug_process_message(struct controlvm_message *inmsg) * true - processing of the controlvm message completed, * either successfully or with an error. */ -static bool -handle_command(struct controlvm_message inmsg, u64 channel_addr) +static bool handle_command(struct controlvm_message inmsg, u64 channel_addr) { struct controlvm_message_packet *cmd = &inmsg.cmd; u64 parm_addr; @@ -1942,8 +1902,7 @@ static u64 controlvm_get_channel_address(void) return addr; } -static void -controlvm_periodic_work(struct work_struct *work) +static void controlvm_periodic_work(struct work_struct *work) { struct controlvm_message inmsg; bool got_command = false; @@ -2033,8 +1992,7 @@ cleanup: &periodic_controlvm_work, poll_jiffies); } -static void -setup_crash_devices_work_queue(struct work_struct *work) +static void setup_crash_devices_work_queue(struct work_struct *work) { struct controlvm_message local_crash_bus_msg; struct controlvm_message local_crash_dev_msg; @@ -2131,32 +2089,27 @@ cleanup: &periodic_controlvm_work, poll_jiffies); } -static void -bus_create_response(u32 bus_no, int response) +static void bus_create_response(u32 bus_no, int response) { bus_responder(CONTROLVM_BUS_CREATE, bus_no, response); } -static void -bus_destroy_response(u32 bus_no, int response) +static void bus_destroy_response(u32 bus_no, int response) { bus_responder(CONTROLVM_BUS_DESTROY, bus_no, response); } -static void -device_create_response(u32 bus_no, u32 dev_no, int response) +static void device_create_response(u32 bus_no, u32 dev_no, int response) { device_responder(CONTROLVM_DEVICE_CREATE, bus_no, dev_no, response); } -static void -device_destroy_response(u32 bus_no, u32 dev_no, int response) +static void device_destroy_response(u32 bus_no, u32 dev_no, int response) { device_responder(CONTROLVM_DEVICE_DESTROY, bus_no, dev_no, response); } -void -visorchipset_device_pause_response(u32 bus_no, u32 dev_no, int response) +void visorchipset_device_pause_response(u32 bus_no, u32 dev_no, int response) { device_changestate_responder(CONTROLVM_DEVICE_CHANGESTATE, bus_no, dev_no, response, @@ -2164,16 +2117,15 @@ visorchipset_device_pause_response(u32 bus_no, u32 dev_no, int response) } EXPORT_SYMBOL_GPL(visorchipset_device_pause_response); -static void -device_resume_response(u32 bus_no, u32 dev_no, int response) +static void device_resume_response(u32 bus_no, u32 dev_no, int response) { device_changestate_responder(CONTROLVM_DEVICE_CHANGESTATE, bus_no, dev_no, response, segment_state_running); } -bool -visorchipset_get_bus_info(u32 bus_no, struct visorchipset_bus_info *bus_info) +bool visorchipset_get_bus_info(u32 bus_no, + struct visorchipset_bus_info *bus_info) { void *p = bus_find(&bus_info_list, bus_no); @@ -2184,8 +2136,7 @@ visorchipset_get_bus_info(u32 bus_no, struct visorchipset_bus_info *bus_info) } EXPORT_SYMBOL_GPL(visorchipset_get_bus_info); -bool -visorchipset_set_bus_context(u32 bus_no, void *context) +bool visorchipset_set_bus_context(u32 bus_no, void *context) { struct visorchipset_bus_info *p = bus_find(&bus_info_list, bus_no); @@ -2196,8 +2147,7 @@ visorchipset_set_bus_context(u32 bus_no, void *context) } EXPORT_SYMBOL_GPL(visorchipset_set_bus_context); -bool -visorchipset_get_device_info(u32 bus_no, u32 dev_no, +bool visorchipset_get_device_info(u32 bus_no, u32 dev_no, struct visorchipset_device_info *dev_info) { void *p = device_find(&dev_info_list, bus_no, dev_no); @@ -2209,8 +2159,7 @@ visorchipset_get_device_info(u32 bus_no, u32 dev_no, } EXPORT_SYMBOL_GPL(visorchipset_get_device_info); -bool -visorchipset_set_device_context(u32 bus_no, u32 dev_no, void *context) +bool visorchipset_set_device_context(u32 bus_no, u32 dev_no, void *context) { struct visorchipset_device_info *p; @@ -2276,8 +2225,7 @@ static ssize_t deviceenabled_store(struct device *dev, return count; } -static int -visorchipset_mmap(struct file *file, struct vm_area_struct *vma) +static int visorchipset_mmap(struct file *file, struct vm_area_struct *vma) { unsigned long physaddr = 0; unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; @@ -2351,8 +2299,8 @@ static const struct file_operations visorchipset_fops = { .mmap = visorchipset_mmap, }; -int -visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel) +int visorchipset_file_init(dev_t major_dev, + struct visorchannel **controlvm_channel) { int rc = 0; @@ -2378,8 +2326,7 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel) return 0; } -static int -visorchipset_init(struct acpi_device *acpi_device) +static int visorchipset_init(struct acpi_device *acpi_device) { int rc = 0; u64 addr; @@ -2460,8 +2407,7 @@ cleanup: return rc; } -void -visorchipset_file_cleanup(dev_t major_dev) +void visorchipset_file_cleanup(dev_t major_dev) { if (file_cdev.ops) cdev_del(&file_cdev); @@ -2469,8 +2415,7 @@ visorchipset_file_cleanup(dev_t major_dev) unregister_chrdev_region(major_dev, 1); } -static int -visorchipset_exit(struct acpi_device *acpi_device) +static int visorchipset_exit(struct acpi_device *acpi_device) { POSTCODE_LINUX_2(DRIVER_EXIT_PC, POSTCODE_SEVERITY_INFO); -- 2.4.0 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel