diff options
Diffstat (limited to 'drivers/pci/endpoint/functions/pci-epf-ntb.c')
| -rw-r--r-- | drivers/pci/endpoint/functions/pci-epf-ntb.c | 22 | 
1 files changed, 8 insertions, 14 deletions
| diff --git a/drivers/pci/endpoint/functions/pci-epf-ntb.c b/drivers/pci/endpoint/functions/pci-epf-ntb.c index 8b4756159f15..5a03401f4571 100644 --- a/drivers/pci/endpoint/functions/pci-epf-ntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-ntb.c @@ -1937,7 +1937,7 @@ static ssize_t epf_ntb_##_name##_show(struct config_item *item,		\  	struct config_group *group = to_config_group(item);		\  	struct epf_ntb *ntb = to_epf_ntb(group);			\  									\ -	return sprintf(page, "%d\n", ntb->_name);			\ +	return sysfs_emit(page, "%d\n", ntb->_name);			\  }  #define EPF_NTB_W(_name)						\ @@ -1947,11 +1947,9 @@ static ssize_t epf_ntb_##_name##_store(struct config_item *item,	\  	struct config_group *group = to_config_group(item);		\  	struct epf_ntb *ntb = to_epf_ntb(group);			\  	u32 val;							\ -	int ret;							\  									\ -	ret = kstrtou32(page, 0, &val);					\ -	if (ret)							\ -		return ret;						\ +	if (kstrtou32(page, 0, &val) < 0)				\ +		return -EINVAL;						\  									\  	ntb->_name = val;						\  									\ @@ -1968,7 +1966,7 @@ static ssize_t epf_ntb_##_name##_show(struct config_item *item,		\  									\  	sscanf(#_name, "mw%d", &win_no);				\  									\ -	return sprintf(page, "%lld\n", ntb->mws_size[win_no - 1]);	\ +	return sysfs_emit(page, "%lld\n", ntb->mws_size[win_no - 1]);	\  }  #define EPF_NTB_MW_W(_name)						\ @@ -1980,11 +1978,9 @@ static ssize_t epf_ntb_##_name##_store(struct config_item *item,	\  	struct device *dev = &ntb->epf->dev;				\  	int win_no;							\  	u64 val;							\ -	int ret;							\  									\ -	ret = kstrtou64(page, 0, &val);					\ -	if (ret)							\ -		return ret;						\ +	if (kstrtou64(page, 0, &val) < 0)				\ +		return -EINVAL;						\  									\  	if (sscanf(#_name, "mw%d", &win_no) != 1)			\  		return -EINVAL;						\ @@ -2005,11 +2001,9 @@ static ssize_t epf_ntb_num_mws_store(struct config_item *item,  	struct config_group *group = to_config_group(item);  	struct epf_ntb *ntb = to_epf_ntb(group);  	u32 val; -	int ret; -	ret = kstrtou32(page, 0, &val); -	if (ret) -		return ret; +	if (kstrtou32(page, 0, &val) < 0) +		return -EINVAL;  	if (val > MAX_MW)  		return -EINVAL; |