leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: unisys: visornic: fix multi-line function definition

Browse Source 
Fixed incorrect function declaration style in visornic/visornic_main.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:
Charles Daniels 2017-07-17 16:17:21 -04:00 committed by Greg Kroah-Hartman
parent 4f4205ed31
commit af9f5e7d5a
1 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
drivers/staging/unisys/visornic/visornic_main.c
View File

@ -155,9 +155,9 @@ struct visornic_devdata {
}; };
/* Returns next non-zero index on success or 0 on failure (i.e. out of room). */ /* Returns next non-zero index on success or 0 on failure (i.e. out of room). */
static u16 static u16 add_physinfo_entries(u64 inp_pfn, u16 inp_off, u32 inp_len,
add_physinfo_entries(u64 inp_pfn, u16 inp_off, u32 inp_len, u16 index, u16 index, u16 max_pi_arr_entries,
u16 max_pi_arr_entries, struct phys_info pi_arr[]) struct phys_info pi_arr[])
{ {
u32 len; u32 len;
u16 i, firstlen; u16 i, firstlen;
@ -203,10 +203,10 @@ add_physinfo_entries(u64 inp_pfn, u16 inp_off, u32 inp_len, u16 index,
* Return value indicates number of entries filled in frags * Return value indicates number of entries filled in frags
* Negative values indicate an error. * Negative values indicate an error.
*/ */
static int static int visor_copy_fragsinfo_from_skb(struct sk_buff *skb,
visor_copy_fragsinfo_from_skb(struct sk_buff *skb, unsigned int firstfraglen, unsigned int firstfraglen,
unsigned int frags_max, unsigned int frags_max,
struct phys_info frags[]) struct phys_info frags[])
{ {
unsigned int count = 0, frag, size, offset = 0, numfrags; unsigned int count = 0, frag, size, offset = 0, numfrags;
unsigned int total_count; unsigned int total_count;
@ -309,8 +309,7 @@ static const struct file_operations debugfs_enable_ints_fops = {
* being down. * being down.
* Returns void. * Returns void.
*/ */
static void static void visornic_serverdown_complete(struct visornic_devdata *devdata)
visornic_serverdown_complete(struct visornic_devdata *devdata)
{ {
struct net_device *netdev = devdata->netdev; struct net_device *netdev = devdata->netdev;
@ -341,9 +340,8 @@ visornic_serverdown_complete(struct visornic_devdata *devdata)
* sure we haven't already handled the server change state event. * sure we haven't already handled the server change state event.
* Returns 0 if we scheduled the work, -EINVAL on error. * Returns 0 if we scheduled the work, -EINVAL on error.
*/ */
static int static int visornic_serverdown(struct visornic_devdata *devdata,
visornic_serverdown(struct visornic_devdata *devdata, visorbus_state_complete_func complete_func)
visorbus_state_complete_func complete_func)
{ {
unsigned long flags; unsigned long flags;
int err; int err;
@ -388,8 +386,7 @@ err_unlock:
* so that it can write rcv data into our memory space. * so that it can write rcv data into our memory space.
* Return pointer to sk_buff * Return pointer to sk_buff
*/ */
static struct sk_buff * static struct sk_buff *alloc_rcv_buf(struct net_device *netdev)
alloc_rcv_buf(struct net_device *netdev)
{ {
struct sk_buff *skb; struct sk_buff *skb;
@ -420,9 +417,8 @@ alloc_rcv_buf(struct net_device *netdev)
* Send the skb to the IO Partition. * Send the skb to the IO Partition.
* Returns 0 or error * Returns 0 or error
*/ */
static int static int post_skb(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata,
post_skb(struct uiscmdrsp *cmdrsp, struct sk_buff *skb)
struct visornic_devdata *devdata, struct sk_buff *skb)
{ {
int err; int err;
@ -461,9 +457,8 @@ post_skb(struct uiscmdrsp *cmdrsp,
* Send the enable/disable message to the IO Partition. * Send the enable/disable message to the IO Partition.
* Returns 0 or error * Returns 0 or error
*/ */
static int static int send_enbdis(struct net_device *netdev, int state,
send_enbdis(struct net_device *netdev, int state, struct visornic_devdata *devdata)
struct visornic_devdata *devdata)
{ {
int err; int err;
@ -490,8 +485,8 @@ send_enbdis(struct net_device *netdev, int state,
* Returns 0 on success, negative for failure of IO Partition * Returns 0 on success, negative for failure of IO Partition
* responding. * responding.
*/ */
static int static int visornic_disable_with_timeout(struct net_device *netdev,
visornic_disable_with_timeout(struct net_device *netdev, const int timeout) const int timeout)
{ {
struct visornic_devdata *devdata = netdev_priv(netdev); struct visornic_devdata *devdata = netdev_priv(netdev);
int i; int i;
@ -578,8 +573,8 @@ visornic_disable_with_timeout(struct net_device *netdev, const int timeout)
* Allocate rcv buffers and post them to the IO Partition. * Allocate rcv buffers and post them to the IO Partition.
* Return 0 for success, and negative for failure. * Return 0 for success, and negative for failure.
*/ */
static int static int init_rcv_bufs(struct net_device *netdev,
init_rcv_bufs(struct net_device *netdev, struct visornic_devdata *devdata) struct visornic_devdata *devdata)
{ {
int i, j, count, err; int i, j, count, err;
@ -645,8 +640,8 @@ init_rcv_bufs(struct net_device *netdev, struct visornic_devdata *devdata)
* timeout is defined in msecs (timeout of 0 specifies infinite wait) * timeout is defined in msecs (timeout of 0 specifies infinite wait)
* Return 0 for success, negative for failure. * Return 0 for success, negative for failure.
*/ */
static int static int visornic_enable_with_timeout(struct net_device *netdev,
visornic_enable_with_timeout(struct net_device *netdev, const int timeout) const int timeout)
{ {
int err = 0; int err = 0;
struct visornic_devdata *devdata = netdev_priv(netdev); struct visornic_devdata *devdata = netdev_priv(netdev);
@ -718,8 +713,7 @@ visornic_enable_with_timeout(struct net_device *netdev, const int timeout)
* device for our virtual NIC we will send a Disable and Enable * device for our virtual NIC we will send a Disable and Enable
* to the IOVM. If it doesn't respond we will trigger a serverdown. * to the IOVM. If it doesn't respond we will trigger a serverdown.
*/ */
static void static void visornic_timeout_reset(struct work_struct *work)
visornic_timeout_reset(struct work_struct *work)
{ {
struct visornic_devdata *devdata; struct visornic_devdata *devdata;
struct net_device *netdev; struct net_device *netdev;
@ -760,8 +754,7 @@ call_serverdown:
* Enable the device and start the transmit queue. * Enable the device and start the transmit queue.
* Return 0 for success * Return 0 for success
*/ */
static int static int visornic_open(struct net_device *netdev)
visornic_open(struct net_device *netdev)
{ {
visornic_enable_with_timeout(netdev, VISORNIC_INFINITE_RSP_WAIT); visornic_enable_with_timeout(netdev, VISORNIC_INFINITE_RSP_WAIT);
return 0; return 0;
@ -774,8 +767,7 @@ visornic_open(struct net_device *netdev)
* Disable the device and stop the transmit queue. * Disable the device and stop the transmit queue.
* Return 0 for success * Return 0 for success
*/ */
static int static int visornic_close(struct net_device *netdev)
visornic_close(struct net_device *netdev)
{ {
visornic_disable_with_timeout(netdev, VISORNIC_INFINITE_RSP_WAIT); visornic_disable_with_timeout(netdev, VISORNIC_INFINITE_RSP_WAIT);
return 0; return 0;
@ -839,8 +831,7 @@ static bool vnic_hit_low_watermark(struct visornic_devdata *devdata,
* can be called again. * can be called again.
* Returns NETDEV_TX_OK. * Returns NETDEV_TX_OK.
*/ */
static int static int visornic_xmit(struct sk_buff *skb, struct net_device *netdev)
visornic_xmit(struct sk_buff *skb, struct net_device *netdev)
{ {
struct visornic_devdata *devdata; struct visornic_devdata *devdata;
int len, firstfraglen, padlen; int len, firstfraglen, padlen;
@ -1007,8 +998,7 @@ visornic_xmit(struct sk_buff *skb, struct net_device *netdev)
* *
* Returns the net_device_stats for the device * Returns the net_device_stats for the device
*/ */
static struct net_device_stats * static struct net_device_stats *visornic_get_stats(struct net_device *netdev)
visornic_get_stats(struct net_device *netdev)
{ {
struct visornic_devdata *devdata = netdev_priv(netdev); struct visornic_devdata *devdata = netdev_priv(netdev);
@ -1026,8 +1016,7 @@ visornic_get_stats(struct net_device *netdev)
* Currently not supported. * Currently not supported.
* Returns EINVAL * Returns EINVAL
*/ */
static int static int visornic_change_mtu(struct net_device *netdev, int new_mtu)
visornic_change_mtu(struct net_device *netdev, int new_mtu)
{ {
return -EINVAL; return -EINVAL;
} }
@ -1039,8 +1028,7 @@ visornic_change_mtu(struct net_device *netdev, int new_mtu)
* Only flag we support currently is IFF_PROMISC * Only flag we support currently is IFF_PROMISC
* Returns void * Returns void
*/ */
static void static void visornic_set_multi(struct net_device *netdev)
visornic_set_multi(struct net_device *netdev)
{ {
struct uiscmdrsp *cmdrsp; struct uiscmdrsp *cmdrsp;
struct visornic_devdata *devdata = netdev_priv(netdev); struct visornic_devdata *devdata = netdev_priv(netdev);
@ -1080,8 +1068,7 @@ out_save_flags:
* been informed the IO Partition is gone, if it is gone * been informed the IO Partition is gone, if it is gone
* we will already timeout the xmits. * we will already timeout the xmits.
*/ */
static void static void visornic_xmit_timeout(struct net_device *netdev)
visornic_xmit_timeout(struct net_device *netdev)
{ {
struct visornic_devdata *devdata = netdev_priv(netdev); struct visornic_devdata *devdata = netdev_priv(netdev);
unsigned long flags; unsigned long flags;
@ -1118,9 +1105,9 @@ visornic_xmit_timeout(struct net_device *netdev)
* we are finished with them. * we are finished with them.
* Returns 0 for success, -1 for error. * Returns 0 for success, -1 for error.
*/ */
static int static int repost_return(struct uiscmdrsp *cmdrsp,
repost_return(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata, struct visornic_devdata *devdata,
struct sk_buff *skb, struct net_device *netdev) struct sk_buff *skb, struct net_device *netdev)
{ {
struct net_pkt_rcv copy; struct net_pkt_rcv copy;
int i = 0, cc, numreposted; int i = 0, cc, numreposted;
@ -1192,8 +1179,7 @@ repost_return(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata,
* it up the stack. * it up the stack.
* Returns 1 iff an skb was received, otherwise 0 * Returns 1 iff an skb was received, otherwise 0
*/ */
static int static int visornic_rx(struct uiscmdrsp *cmdrsp)
visornic_rx(struct uiscmdrsp *cmdrsp)
{ {
struct visornic_devdata *devdata; struct visornic_devdata *devdata;
struct sk_buff *skb, *prev, *curr; struct sk_buff *skb, *prev, *curr;
@ -1398,8 +1384,9 @@ visornic_rx(struct uiscmdrsp *cmdrsp)
* values. * values.
* Returns a pointer to the devdata structure * Returns a pointer to the devdata structure
*/ */
static struct visornic_devdata * static struct visornic_devdata *devdata_initialize(
devdata_initialize(struct visornic_devdata *devdata, struct visor_device *dev) struct visornic_devdata *devdata,
struct visor_device *dev)
{ {
devdata->dev = dev; devdata->dev = dev;
devdata->incarnation_id = get_jiffies_64(); devdata->incarnation_id = get_jiffies_64();
@ -1590,8 +1577,7 @@ static const struct file_operations debugfs_info_fops = {
* Send receive buffers to the IO Partition. * Send receive buffers to the IO Partition.
* Returns void * Returns void
*/ */
static int static int send_rcv_posts_if_needed(struct visornic_devdata *devdata)
send_rcv_posts_if_needed(struct visornic_devdata *devdata)
{ {
int i; int i;
struct net_device *netdev; struct net_device *netdev;
@ -1638,8 +1624,8 @@ send_rcv_posts_if_needed(struct visornic_devdata *devdata)
* @cmdrsp: io channel command response message * @cmdrsp: io channel command response message
* @devdata: visornic device to drain * @devdata: visornic device to drain
*/ */
static void static void drain_resp_queue(struct uiscmdrsp *cmdrsp,
drain_resp_queue(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata) struct visornic_devdata *devdata)
{ {
while (!visorchannel_signalremove(devdata->dev->visorchannel, while (!visorchannel_signalremove(devdata->dev->visorchannel,
IOCHAN_FROM_IOPART, IOCHAN_FROM_IOPART,
@ -1656,9 +1642,9 @@ drain_resp_queue(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata)
* Process the responses as we get them. * Process the responses as we get them.
* Returns when response queue is empty or when the thread stops. * Returns when response queue is empty or when the thread stops.
*/ */
static void static void service_resp_queue(struct uiscmdrsp *cmdrsp,
service_resp_queue(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata, struct visornic_devdata *devdata,
int *rx_work_done, int budget) int *rx_work_done, int budget)
{ {
unsigned long flags; unsigned long flags;
struct net_device *netdev; struct net_device *netdev;
@ -1777,8 +1763,7 @@ static int visornic_poll(struct napi_struct *napi, int budget)
* response queue and drain it if needed. * response queue and drain it if needed.
* Returns when thread has stopped. * Returns when thread has stopped.
*/ */
static void static void poll_for_irq(unsigned long v)
poll_for_irq(unsigned long v)
{ {
struct visornic_devdata *devdata = (struct visornic_devdata *)v; struct visornic_devdata *devdata = (struct visornic_devdata *)v;