Staging: gasket: Use temporaries to reduce line length.
PATCH v2 1/1 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!
--- drivers/staging/gasket/apex_driver.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/staging/gasket/apex_driver.c +9 -11
@@ -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;
Signature · 1 line
2.23.0
Wow... I checked, compiled and still sent the wrong thing again. I'm gonna have to give this up soon if i can't get it right.
Sandro V
Quoted 63 lines · Sandro Volery
Using temporaries for
gasket_page_tableentries to removescnprintf()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(-)drivers/staging/gasket/apex_driver.c +9
-11@@ -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;Signature · 1 line
2.23.0
Quoted 3 lines · Sandro Volery LKML
Wow... I checked, compiled and still sent the wrong thing again. I'm gonna have to give this up soon if i can't get it right.
The mistake was using gasket_page_table_num_simple_entries() instead of gasket_page_table_num_entries()?
When I write a patch, I always queue it up and the let it sit in my outbox overnight so I can review it again in the morning. Otherwise my mind is clouded with other emotions and I can't review objectively. There is never a rush.
Quoted 6 lines
Sandro V
Quoted 4 lines · Sandro Volery
Using temporaries for
gasket_page_tableentries to removescnprintf()statements and reduce line length, as suggested by Joe Perches. Thanks!
^^^^^^^
Don't put this in the commit log. :P
regards,
dan carpenter