staging: unisys: visorinput: fix multi-line function definition
Fixed incorrect function declaration style in visorinput/visorinput.c by placing the function names on the same line as the return. Signed-off-by: Charles Daniels <cdaniels@fastmail.com> Signed-off-by: David Kershner <david.kershner@unisys.com> Reviewed-by: David Binder <david.binder@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
980bf0cae0
commit
4f4205ed31
@ -276,9 +276,8 @@ out_unlock:
|
|||||||
* we can use to deliver keyboard inputs to Linux. We of course do this when
|
* we can use to deliver keyboard inputs to Linux. We of course do this when
|
||||||
* we see keyboard inputs coming in on a keyboard channel.
|
* we see keyboard inputs coming in on a keyboard channel.
|
||||||
*/
|
*/
|
||||||
static struct input_dev *
|
static struct input_dev *setup_client_keyboard(void *devdata,
|
||||||
setup_client_keyboard(void *devdata, /* opaque on purpose */
|
unsigned char *keycode_table)
|
||||||
unsigned char *keycode_table)
|
|
||||||
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -319,8 +318,7 @@ setup_client_keyboard(void *devdata, /* opaque on purpose */
|
|||||||
return visorinput_dev;
|
return visorinput_dev;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct input_dev *
|
static struct input_dev *setup_client_mouse(void *devdata)
|
||||||
setup_client_mouse(void *devdata /* opaque on purpose */)
|
|
||||||
{
|
{
|
||||||
int xres, yres;
|
int xres, yres;
|
||||||
struct fb_info *fb0;
|
struct fb_info *fb0;
|
||||||
@ -361,8 +359,9 @@ setup_client_mouse(void *devdata /* opaque on purpose */)
|
|||||||
return visorinput_dev;
|
return visorinput_dev;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct visorinput_devdata *
|
static struct visorinput_devdata *devdata_create(
|
||||||
devdata_create(struct visor_device *dev, enum visorinput_device_type devtype)
|
struct visor_device *dev,
|
||||||
|
enum visorinput_device_type devtype)
|
||||||
{
|
{
|
||||||
struct visorinput_devdata *devdata = NULL;
|
struct visorinput_devdata *devdata = NULL;
|
||||||
unsigned int extra_bytes = 0;
|
unsigned int extra_bytes = 0;
|
||||||
@ -447,8 +446,7 @@ err_kfree_devdata:
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int visorinput_probe(struct visor_device *dev)
|
||||||
visorinput_probe(struct visor_device *dev)
|
|
||||||
{
|
{
|
||||||
uuid_le guid;
|
uuid_le guid;
|
||||||
enum visorinput_device_type devtype;
|
enum visorinput_device_type devtype;
|
||||||
@ -466,15 +464,13 @@ visorinput_probe(struct visor_device *dev)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void unregister_client_input(struct input_dev *visorinput_dev)
|
||||||
unregister_client_input(struct input_dev *visorinput_dev)
|
|
||||||
{
|
{
|
||||||
if (visorinput_dev)
|
if (visorinput_dev)
|
||||||
input_unregister_device(visorinput_dev);
|
input_unregister_device(visorinput_dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void visorinput_remove(struct visor_device *dev)
|
||||||
visorinput_remove(struct visor_device *dev)
|
|
||||||
{
|
{
|
||||||
struct visorinput_devdata *devdata = dev_get_drvdata(&dev->device);
|
struct visorinput_devdata *devdata = dev_get_drvdata(&dev->device);
|
||||||
|
|
||||||
@ -500,9 +496,8 @@ visorinput_remove(struct visor_device *dev)
|
|||||||
* Make it so the current locking state of the locking key indicated by
|
* Make it so the current locking state of the locking key indicated by
|
||||||
* <keycode> is as indicated by <desired_state> (1=locked, 0=unlocked).
|
* <keycode> is as indicated by <desired_state> (1=locked, 0=unlocked).
|
||||||
*/
|
*/
|
||||||
static void
|
static void handle_locking_key(struct input_dev *visorinput_dev, int keycode,
|
||||||
handle_locking_key(struct input_dev *visorinput_dev,
|
int desired_state)
|
||||||
int keycode, int desired_state)
|
|
||||||
{
|
{
|
||||||
int led;
|
int led;
|
||||||
|
|
||||||
@ -534,8 +529,7 @@ handle_locking_key(struct input_dev *visorinput_dev,
|
|||||||
* with 0xE0 in the low byte and the extended scancode value in the next
|
* with 0xE0 in the low byte and the extended scancode value in the next
|
||||||
* higher byte.
|
* higher byte.
|
||||||
*/
|
*/
|
||||||
static int
|
static int scancode_to_keycode(int scancode)
|
||||||
scancode_to_keycode(int scancode)
|
|
||||||
{
|
{
|
||||||
if (scancode > 0xff)
|
if (scancode > 0xff)
|
||||||
return visorkbd_ext_keycode[(scancode >> 8) & 0xff];
|
return visorkbd_ext_keycode[(scancode >> 8) & 0xff];
|
||||||
@ -543,8 +537,7 @@ scancode_to_keycode(int scancode)
|
|||||||
return visorkbd_keycode[scancode];
|
return visorkbd_keycode[scancode];
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int calc_button(int x)
|
||||||
calc_button(int x)
|
|
||||||
{
|
{
|
||||||
switch (x) {
|
switch (x) {
|
||||||
case 1:
|
case 1:
|
||||||
@ -563,8 +556,7 @@ calc_button(int x)
|
|||||||
* client guest partition. It is called periodically so we can obtain inputs
|
* client guest partition. It is called periodically so we can obtain inputs
|
||||||
* from the channel, and deliver them to the guest OS.
|
* from the channel, and deliver them to the guest OS.
|
||||||
*/
|
*/
|
||||||
static void
|
static void visorinput_channel_interrupt(struct visor_device *dev)
|
||||||
visorinput_channel_interrupt(struct visor_device *dev)
|
|
||||||
{
|
{
|
||||||
struct visor_inputreport r;
|
struct visor_inputreport r;
|
||||||
int scancode, keycode;
|
int scancode, keycode;
|
||||||
@ -656,9 +648,8 @@ visorinput_channel_interrupt(struct visor_device *dev)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int visorinput_pause(struct visor_device *dev,
|
||||||
visorinput_pause(struct visor_device *dev,
|
visorbus_state_complete_func complete_func)
|
||||||
visorbus_state_complete_func complete_func)
|
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
struct visorinput_devdata *devdata = dev_get_drvdata(&dev->device);
|
struct visorinput_devdata *devdata = dev_get_drvdata(&dev->device);
|
||||||
@ -689,9 +680,8 @@ out:
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int visorinput_resume(struct visor_device *dev,
|
||||||
visorinput_resume(struct visor_device *dev,
|
visorbus_state_complete_func complete_func)
|
||||||
visorbus_state_complete_func complete_func)
|
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
struct visorinput_devdata *devdata = dev_get_drvdata(&dev->device);
|
struct visorinput_devdata *devdata = dev_get_drvdata(&dev->device);
|
||||||
@ -741,14 +731,12 @@ static struct visor_driver visorinput_driver = {
|
|||||||
.resume = visorinput_resume,
|
.resume = visorinput_resume,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int
|
static int visorinput_init(void)
|
||||||
visorinput_init(void)
|
|
||||||
{
|
{
|
||||||
return visorbus_register_visor_driver(&visorinput_driver);
|
return visorbus_register_visor_driver(&visorinput_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void visorinput_cleanup(void)
|
||||||
visorinput_cleanup(void)
|
|
||||||
{
|
{
|
||||||
visorbus_unregister_visor_driver(&visorinput_driver);
|
visorbus_unregister_visor_driver(&visorinput_driver);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user