2019-09-10 18:40:01

by Sandro Volery

Subject: [PATCH] Staging: gasket: Use temporaries to reduce line length.

Using temporaries for gasket_page_table entries to remove scnprintf()
statements and reduce line length, as suggested by Joe Perches. Thanks!

Signed-off-by: Sandro Volery <[email protected]>
---
drivers/staging/gasket/apex_driver.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/gasket/apex_driver.c b/drivers/staging/gasket/apex_driver.c
index 2973bb920a26..16ac4329d65f 100644
--- a/drivers/staging/gasket/apex_driver.c
+++ b/drivers/staging/gasket/apex_driver.c
@@ -509,6 +509,8 @@ static ssize_t sysfs_show(struct device *device, struct device_attribute *attr,
struct gasket_dev *gasket_dev;
struct gasket_sysfs_attribute *gasket_attr;
enum sysfs_attribute_type type;
+ struct gasket_page_table *gpt;
+ uint val;

gasket_dev = gasket_sysfs_get_device_data(device);
if (!gasket_dev) {
@@ -524,29 +526,25 @@ static ssize_t sysfs_show(struct device *device, struct device_attribute *attr,
}

type = (enum sysfs_attribute_type)gasket_attr->data.attr_type;
+ gpt = gasket_dev->page_table[0];
switch (type) {
case ATTR_KERNEL_HIB_PAGE_TABLE_SIZE:
- ret = scnprintf(buf, PAGE_SIZE, "%u\n",
- gasket_page_table_num_entries(
- gasket_dev->page_table[0]));
+ val = gasket_page_table_num_simple_entries(gpt);
break;
case ATTR_KERNEL_HIB_SIMPLE_PAGE_TABLE_SIZE:
- ret = scnprintf(buf, PAGE_SIZE, "%u\n",
- gasket_page_table_num_simple_entries(
- gasket_dev->page_table[0]));
+ val = gasket_page_table_num_simple_entries(gpt);
break;
case ATTR_KERNEL_HIB_NUM_ACTIVE_PAGES:
- ret = scnprintf(buf, PAGE_SIZE, "%u\n",
- gasket_page_table_num_active_pages(
- gasket_dev->page_table[0]));
+ val = gasket_page_table_num_active_pages(gpt);
break;
default:
dev_dbg(gasket_dev->dev, "Unknown attribute: %s\n",
attr->attr.name);
ret = 0;
- break;
+ goto exit;
}
-
+ ret = scnprintf(buf, PAGE_SIZE, "%u\n", val);
+exit:
gasket_sysfs_put_attr(device, gasket_attr);
gasket_sysfs_put_device_data(device, gasket_dev);
return ret;
--
2.23.0

2019-09-10 18:44:22

by Joe Perches

Subject: Re: [PATCH] Staging: gasket: Use temporaries to reduce line length.

On Mon, 2019-09-09 at 22:28 +0200, Sandro Volery wrote:
> Using temporaries for gasket_page_table entries to remove scnprintf()
> statements and reduce line length, as suggested by Joe Perches. Thanks!

nak. Slow down. You broke the code.

Please be _way_ more careful and verify for yourself
the code you submit _before_ you submit it.

compile/test/verify, twice if necessary.

You also should have cc'd me on this patch.

> diff --git a/drivers/staging/gasket/apex_driver.c b/drivers/staging/gasket/apex_driver.c
[]
> @@ -524,29 +526,25 @@ static ssize_t sysfs_show(struct device *device, struct device_attribute *attr,
> }
>
> type = (enum sysfs_attribute_type)gasket_attr->data.attr_type;
> + gpt = gasket_dev->page_table[0];
> switch (type) {
> case ATTR_KERNEL_HIB_PAGE_TABLE_SIZE:
> - ret = scnprintf(buf, PAGE_SIZE, "%u\n",
> - gasket_page_table_num_entries(
> - gasket_dev->page_table[0]));
> + val = gasket_page_table_num_simple_entries(gpt);

You likely duplicated this line via copy/paste.
This should be:
val = gasket_page_table_num_entries(gpt);

> break;
> case ATTR_KERNEL_HIB_SIMPLE_PAGE_TABLE_SIZE:
> - ret = scnprintf(buf, PAGE_SIZE, "%u\n",
> - gasket_page_table_num_simple_entries(
> - gasket_dev->page_table[0]));
> + val = gasket_page_table_num_simple_entries(gpt);

break;
> case ATTR_KERNEL_HIB_NUM_ACTIVE_PAGES:
> - ret = scnprintf(buf, PAGE_SIZE, "%u\n",
> - gasket_page_table_num_active_pages(
> - gasket_dev->page_table[0]));
> + val = gasket_page_table_num_active_pages(gpt);
> break;
> default:
> dev_dbg(gasket_dev->dev, "Unknown attribute: %s\n",
> attr->attr.name);
> ret = 0;
> - break;
> + goto exit;
> }
> -
> + ret = scnprintf(buf, PAGE_SIZE, "%u\n", val);
> +exit:
> gasket_sysfs_put_attr(device, gasket_attr);
> gasket_sysfs_put_device_data(device, gasket_dev);
> return ret;