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

Commit b66e29c9 authored by Sony Chacko's avatar Sony Chacko Committed by David S. Miller
Browse files

qlcnic: fix style issues in qlcnic_sysfs.c file 



Fix coding style issues in qlcnic_sysfs.c file

Signed-off-by: default avatarSony Chacko <sony.chacko@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec079a07

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c

+127 −116
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ int qlcnicvf_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate) 
	return -EOPNOTSUPP;

}



static ssize_t

qlcnic_store_bridged_mode(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t len)

static ssize_t qlcnic_store_bridged_mode(struct device *dev,

					 struct device_attribute *attr,

					 const char *buf, size_t len)

{

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);

	unsigned long new;
@@ -49,9 +49,9 @@ err_out: 
	return ret;

}



static ssize_t

qlcnic_show_bridged_mode(struct device *dev,

		struct device_attribute *attr, char *buf)

static ssize_t qlcnic_show_bridged_mode(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);

	int bridged_mode = 0;
@@ -62,9 +62,9 @@ qlcnic_show_bridged_mode(struct device *dev, 
	return sprintf(buf, "%d\n", bridged_mode);

}



static ssize_t

qlcnic_store_diag_mode(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t len)

static ssize_t qlcnic_store_diag_mode(struct device *dev,

				      struct device_attribute *attr,

				      const char *buf, size_t len)

{

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);

	unsigned long new;
@@ -78,8 +78,7 @@ qlcnic_store_diag_mode(struct device *dev, 
	return len;

}



static ssize_t

qlcnic_show_diag_mode(struct device *dev,

static ssize_t qlcnic_show_diag_mode(struct device *dev,

				     struct device_attribute *attr, char *buf)

{

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -88,9 +87,8 @@ qlcnic_show_diag_mode(struct device *dev, 
		       !!(adapter->flags & QLCNIC_DIAG_ENABLED));

}



static int

qlcnic_validate_beacon(struct qlcnic_adapter *adapter, u16 beacon, u8 *state,

			u8 *rate)

static int qlcnic_validate_beacon(struct qlcnic_adapter *adapter, u16 beacon,

				  u8 *state, u8 *rate)

{

	*rate = LSB(beacon);

	*state = MSB(beacon);
@@ -100,8 +98,9 @@ qlcnic_validate_beacon(struct qlcnic_adapter *adapter, u16 beacon, u8 *state, 
	if (!*state) {

		*rate = __QLCNIC_MAX_LED_RATE;

		return 0;

	} else if (*state > __QLCNIC_MAX_LED_STATE)

	} else if (*state > __QLCNIC_MAX_LED_STATE) {

		return -EINVAL;

	}



	if ((!*rate) || (*rate > __QLCNIC_MAX_LED_RATE))

		return -EINVAL;
@@ -109,9 +108,9 @@ qlcnic_validate_beacon(struct qlcnic_adapter *adapter, u16 beacon, u8 *state, 
	return 0;

}



static ssize_t

qlcnic_store_beacon(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t len)

static ssize_t qlcnic_store_beacon(struct device *dev,

				   struct device_attribute *attr,

				   const char *buf, size_t len)

{

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);

	int max_sds_rings = adapter->max_sds_rings;
@@ -120,8 +119,8 @@ qlcnic_store_beacon(struct device *dev, 
	int err;



	if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) {

		dev_warn(dev, "LED test not supported for non "

				"privilege function\n");

		dev_warn(dev,

			 "LED test not supported in non privileged mode\n");

		return -EOPNOTSUPP;

	}
@@ -174,8 +173,7 @@ qlcnic_store_beacon(struct device *dev, 
	return err;

}



static ssize_t

qlcnic_show_beacon(struct device *dev,

static ssize_t qlcnic_show_beacon(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -183,8 +181,7 @@ qlcnic_show_beacon(struct device *dev, 
	return sprintf(buf, "%d\n", adapter->ahw->beacon_state);

}



static int

qlcnic_sysfs_validate_crb(struct qlcnic_adapter *adapter,

static int qlcnic_sysfs_validate_crb(struct qlcnic_adapter *adapter,

				     loff_t offset, size_t size)

{

	size_t crb_size = 4;
@@ -206,10 +203,9 @@ qlcnic_sysfs_validate_crb(struct qlcnic_adapter *adapter, 
	return 0;

}



static ssize_t

qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr,

		char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj,

				     struct bin_attribute *attr, char *buf,

				     loff_t offset, size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -231,10 +227,9 @@ qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj, 
	return size;

}



static ssize_t

qlcnic_sysfs_write_crb(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr,

		char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_write_crb(struct file *filp, struct kobject *kobj,

				      struct bin_attribute *attr, char *buf,

				      loff_t offset, size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -256,8 +251,7 @@ qlcnic_sysfs_write_crb(struct file *filp, struct kobject *kobj, 
	return size;

}



static int

qlcnic_sysfs_validate_mem(struct qlcnic_adapter *adapter,

static int qlcnic_sysfs_validate_mem(struct qlcnic_adapter *adapter,

				     loff_t offset, size_t size)

{

	if (!(adapter->flags & QLCNIC_DIAG_ENABLED))
@@ -269,10 +263,9 @@ qlcnic_sysfs_validate_mem(struct qlcnic_adapter *adapter, 
	return 0;

}



static ssize_t

qlcnic_sysfs_read_mem(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr,

		char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_read_mem(struct file *filp, struct kobject *kobj,

				     struct bin_attribute *attr, char *buf,

				     loff_t offset, size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -291,10 +284,9 @@ qlcnic_sysfs_read_mem(struct file *filp, struct kobject *kobj, 
	return size;

}



static ssize_t

qlcnic_sysfs_write_mem(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr,

		char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_write_mem(struct file *filp, struct kobject *kobj,

				      struct bin_attribute *attr, char *buf,

				      loff_t offset, size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -313,20 +305,17 @@ qlcnic_sysfs_write_mem(struct file *filp, struct kobject *kobj, 
	return size;

}



static int

validate_pm_config(struct qlcnic_adapter *adapter,

static int validate_pm_config(struct qlcnic_adapter *adapter,

			      struct qlcnic_pm_func_cfg *pm_cfg, int count)

{



	u8 src_pci_func, s_esw_id, d_esw_id;

	u8 dest_pci_func;

	u8 src_pci_func, s_esw_id, d_esw_id, dest_pci_func;

	int i;



	for (i = 0; i < count; i++) {

		src_pci_func = pm_cfg[i].pci_func;

		dest_pci_func = pm_cfg[i].dest_npar;

		if (src_pci_func >= QLCNIC_MAX_PCI_FUNC

				|| dest_pci_func >= QLCNIC_MAX_PCI_FUNC)

		if (src_pci_func >= QLCNIC_MAX_PCI_FUNC ||

		    dest_pci_func >= QLCNIC_MAX_PCI_FUNC)

			return QL_STATUS_INVALID_PARAM;



		if (adapter->npars[src_pci_func].type != QLCNIC_TYPE_NIC)
@@ -340,15 +329,16 @@ validate_pm_config(struct qlcnic_adapter *adapter, 


		if (s_esw_id != d_esw_id)

			return QL_STATUS_INVALID_PARAM;



	}

	return 0;



}



static ssize_t

qlcnic_sysfs_write_pm_config(struct file *filp, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_write_pm_config(struct file *filp,

					    struct kobject *kobj,

					    struct bin_attribute *attr,

					    char *buf, loff_t offset,

					    size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -370,8 +360,8 @@ qlcnic_sysfs_write_pm_config(struct file *filp, struct kobject *kobj, 
		pci_func = pm_cfg[i].pci_func;

		action = !!pm_cfg[i].action;

		id = adapter->npars[pci_func].phy_port;

		ret = qlcnic_config_port_mirroring(adapter, id,

						action, pci_func);

		ret = qlcnic_config_port_mirroring(adapter, id, action,

						   pci_func);

		if (ret)

			return ret;

	}
@@ -385,9 +375,11 @@ qlcnic_sysfs_write_pm_config(struct file *filp, struct kobject *kobj, 
	return size;

}



static ssize_t

qlcnic_sysfs_read_pm_config(struct file *filp, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_read_pm_config(struct file *filp,

					   struct kobject *kobj,

					   struct bin_attribute *attr,

					   char *buf, loff_t offset,

					   size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -409,8 +401,7 @@ qlcnic_sysfs_read_pm_config(struct file *filp, struct kobject *kobj, 
	return size;

}



static int

validate_esw_config(struct qlcnic_adapter *adapter,

static int validate_esw_config(struct qlcnic_adapter *adapter,

			       struct qlcnic_esw_func_cfg *esw_cfg, int count)

{

	u32 op_mode;
@@ -424,9 +415,10 @@ validate_esw_config(struct qlcnic_adapter *adapter, 
		if (pci_func >= QLCNIC_MAX_PCI_FUNC)

			return QL_STATUS_INVALID_PARAM;



		if (adapter->op_mode == QLCNIC_MGMT_FUNC)

		if (adapter->op_mode == QLCNIC_MGMT_FUNC) {

			if (adapter->npars[pci_func].type != QLCNIC_TYPE_NIC)

				return QL_STATUS_INVALID_PARAM;

		}



		switch (esw_cfg[i].op_mode) {

		case QLCNIC_PORT_DEFAULTS:
@@ -457,9 +449,11 @@ validate_esw_config(struct qlcnic_adapter *adapter, 
	return 0;

}



static ssize_t

qlcnic_sysfs_write_esw_config(struct file *file, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_write_esw_config(struct file *file,

					     struct kobject *kobj,

					     struct bin_attribute *attr,

					     char *buf, loff_t offset,

					     size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -479,9 +473,10 @@ qlcnic_sysfs_write_esw_config(struct file *file, struct kobject *kobj, 
		return ret;



	for (i = 0; i < count; i++) {

		if (adapter->op_mode == QLCNIC_MGMT_FUNC)

		if (adapter->op_mode == QLCNIC_MGMT_FUNC) {

			if (qlcnic_config_switch_port(adapter, &esw_cfg[i]))

				return QL_STATUS_INVALID_PARAM;

		}



		if (adapter->ahw->pci_func != esw_cfg[i].pci_func)

			continue;
@@ -531,9 +526,11 @@ out: 
	return size;

}



static ssize_t

qlcnic_sysfs_read_esw_config(struct file *file, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_read_esw_config(struct file *file,

					    struct kobject *kobj,

					    struct bin_attribute *attr,

					    char *buf, loff_t offset,

					    size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -555,9 +552,9 @@ qlcnic_sysfs_read_esw_config(struct file *file, struct kobject *kobj, 
	return size;

}



static int

validate_npar_config(struct qlcnic_adapter *adapter,

				struct qlcnic_npar_func_cfg *np_cfg, int count)

static int validate_npar_config(struct qlcnic_adapter *adapter,

				struct qlcnic_npar_func_cfg *np_cfg,

				int count)

{

	u8 pci_func, i;
@@ -576,9 +573,11 @@ validate_npar_config(struct qlcnic_adapter *adapter, 
	return 0;

}



static ssize_t

qlcnic_sysfs_write_npar_config(struct file *file, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_write_npar_config(struct file *file,

					      struct kobject *kobj,

					      struct bin_attribute *attr,

					      char *buf, loff_t offset,

					      size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -615,9 +614,12 @@ qlcnic_sysfs_write_npar_config(struct file *file, struct kobject *kobj, 
	return size;



}

static ssize_t

qlcnic_sysfs_read_npar_config(struct file *file, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)



static ssize_t qlcnic_sysfs_read_npar_config(struct file *file,

					     struct kobject *kobj,

					     struct bin_attribute *attr,

					     char *buf, loff_t offset,

					     size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -648,9 +650,11 @@ qlcnic_sysfs_read_npar_config(struct file *file, struct kobject *kobj, 
	return size;

}



static ssize_t

qlcnic_sysfs_get_port_stats(struct file *file, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_get_port_stats(struct file *file,

					   struct kobject *kobj,

					   struct bin_attribute *attr,

					   char *buf, loff_t offset,

					   size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -678,9 +682,11 @@ qlcnic_sysfs_get_port_stats(struct file *file, struct kobject *kobj, 
	return size;

}



static ssize_t

qlcnic_sysfs_get_esw_stats(struct file *file, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_get_esw_stats(struct file *file,

					  struct kobject *kobj,

					  struct bin_attribute *attr,

					  char *buf, loff_t offset,

					  size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -708,9 +714,11 @@ qlcnic_sysfs_get_esw_stats(struct file *file, struct kobject *kobj, 
	return size;

}



static ssize_t

qlcnic_sysfs_clear_esw_stats(struct file *file, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_clear_esw_stats(struct file *file,

					    struct kobject *kobj,

					    struct bin_attribute *attr,

					    char *buf, loff_t offset,

					    size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
@@ -732,11 +740,12 @@ qlcnic_sysfs_clear_esw_stats(struct file *file, struct kobject *kobj, 
	return size;

}



static ssize_t

qlcnic_sysfs_clear_port_stats(struct file *file, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_clear_port_stats(struct file *file,

					     struct kobject *kobj,

					     struct bin_attribute *attr,

					     char *buf, loff_t offset,

					     size_t size)

{



	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);

	int ret;
@@ -757,9 +766,11 @@ qlcnic_sysfs_clear_port_stats(struct file *file, struct kobject *kobj, 
	return size;

}



static ssize_t

qlcnic_sysfs_read_pci_config(struct file *file, struct kobject *kobj,

	struct bin_attribute *attr, char *buf, loff_t offset, size_t size)

static ssize_t qlcnic_sysfs_read_pci_config(struct file *file,

					    struct kobject *kobj,

					    struct bin_attribute *attr,

					    char *buf, loff_t offset,

					    size_t size)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);