Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74552f1b authored by Michael Hoefler's avatar Michael Hoefler Committed by Greg Kroah-Hartman
Browse files

silicom: fix whitespace issues in bypass.c 



This patch addresses several problems in bypass.c found by checkpatch.
Furthermore it removes/adds some empty lines to make the code more readable.

The following problems are fixed:
 - line over 80 characters
 - space after logical operator !
 - spaces instead of tabs
 - missing empty line after local declarations
 - empty line after {

The empty line issues were not discovered by checkpatch but in my opinion these
changes make perfect sense in terms of readability.

Signed-off-by: default avatarMichael Hoefler <michael.hoefler@studium.uni-erlangen.de>
Signed-off-by: default avatarChristoph Kohl <christoph.kohl@t-online.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a322b495

drivers/staging/silicom/bypasslib/bypass.c

+61 −50
Original line number Diff line number Diff line
@@ -66,13 +66,12 @@ static int doit(int cmd, int if_index, int *data) 
	int ret = -1;

	struct net_device *dev;

	struct net_device *n;

	for_each_netdev_safe(&init_net, dev, n) {



	for_each_netdev_safe(&init_net, dev, n) {

		if (dev->ifindex == if_index) {

			ret = do_cmd(dev, &ifr, cmd, data);

			if (ret < 0)

				ret = -1;



		}

	}
@@ -88,7 +87,9 @@ static int doit(int cmd, int if_index, int *data) 
	if (fn_ex) {					\

		ret = fn_ex(arg);			\

		bp_symbol_put(fn_name##_sd);		\

       } else ret=-1; \

	} else {					\

		ret = -1;				\

	}						\

})



#define  SET_BPLIB_INT_FN2(fn_name, arg_type, arg, arg_type1, arg1, ret)\
@@ -97,15 +98,21 @@ static int doit(int cmd, int if_index, int *data) 
	if (fn_ex) {							\

		ret = fn_ex(arg, arg1);					\

		bp_symbol_put(fn_name##_sd);				\

       } else ret=-1; \

	} else {							\

		ret = -1;						\

	}								\

})

#define SET_BPLIB_INT_FN3(fn_name, arg_type, arg, arg_type1, arg1,arg_type2, arg2, ret) \



#define SET_BPLIB_INT_FN3(fn_name, arg_type, arg, arg_type1, arg1,	\

			  arg_type2, arg2, ret)				\

({	int (*fn_ex)(arg_type, arg_type1, arg_type2) = NULL;		\

	fn_ex = bp_symbol_get(fn_name##_sd);				\

	if (fn_ex) {							\

		ret = fn_ex(arg, arg1, arg2);				\

		bp_symbol_put(fn_name##_sd);				\

       } else ret=-1; \

	} else {							\

		ret = -1;						\

	}								\

})



#define DO_BPLIB_GET_ARG_FN(fn_name, ioctl_val, if_index)	\
@@ -120,7 +127,8 @@ static int doit(int cmd, int if_index, int *data) 
#define DO_BPLIB_SET_ARG_FN(fn_name, ioctl_val, if_index, arg)	\

({	int data, ret = 0;					\

	if (is_dev_sd(if_index)) {				\

            SET_BPLIB_INT_FN2(fn_name, int, if_index, int, arg, ret); \

		SET_BPLIB_INT_FN2(fn_name, int, if_index, int,	\

				  arg, ret);			\

		return ret;					\

	}							\

	data = arg;						\
@@ -268,6 +276,7 @@ EXPORT_SYMBOL(get_bypass_pwup); 
static int set_bypass_wd(int if_index, int ms_timeout, int *ms_timeout_set)

{

	int data = ms_timeout, ret = 0;



	if (is_dev_sd(if_index))

		SET_BPLIB_INT_FN3(set_bypass_wd, int, if_index, int, ms_timeout,

				  int *, ms_timeout_set, ret);
@@ -285,6 +294,7 @@ EXPORT_SYMBOL(set_bypass_wd); 
static int get_bypass_wd(int if_index, int *ms_timeout_set)

{

	int *data = ms_timeout_set, ret = 0;



	if (is_dev_sd(if_index))

		SET_BPLIB_INT_FN2(get_bypass_wd, int, if_index, int *,

				  ms_timeout_set, ret);
@@ -297,6 +307,7 @@ EXPORT_SYMBOL(get_bypass_wd); 
static int get_wd_expire_time(int if_index, int *ms_time_left)

{

	int *data = ms_time_left, ret = 0;



	if (is_dev_sd(if_index))

		SET_BPLIB_INT_FN2(get_wd_expire_time, int, if_index, int *,

				  ms_time_left, ret);
@@ -476,13 +487,14 @@ EXPORT_SYMBOL(get_bp_hw_reset); 
static int get_bypass_info(int if_index, struct bp_info *bp_info)

{

	int ret = 0;



	if (is_dev_sd(if_index)) {

		SET_BPLIB_INT_FN2(get_bypass_info, int, if_index,

				  struct bp_info *, bp_info, ret);

	} else {

		struct net_device *dev;



		struct net_device *n;



		for_each_netdev_safe(&init_net, dev, n) {

			if (dev->ifindex == if_index) {

				struct if_bypass_info *bypass_cb;
@@ -514,7 +526,6 @@ EXPORT_SYMBOL(get_bypass_info); 


int init_lib_module(void)

{



	printk(VERSION);

	return 0;

}