From a2b88e7894fadac8e8162ae2e45ca09b9b8962c8 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 22 Aug 2014 07:19:55 +0000 Subject: [PATCH] Fix a kernel 3.16 checkpatch complaint about trailing semicolons Avoid that the checkpatch tool included in Linux kernel v3.16 reports the following warning: macros should not use a trailing semicolon This patch does not change any functionality. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5724 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/session.c | 6 +++--- scst/include/scst.h | 2 +- scst/src/scst_sysfs.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/iscsi-scst/kernel/session.c b/iscsi-scst/kernel/session.c index 953492276..9e80c2f46 100644 --- a/iscsi-scst/kernel/session.c +++ b/iscsi-scst/kernel/session.c @@ -466,7 +466,7 @@ static ssize_t iscsi_sess_show_##name(struct kobject *kobj, \ } \ \ static struct kobj_attribute iscsi_sess_attr_##name = \ - __ATTR(exported_name, S_IRUGO, iscsi_sess_show_##name, NULL); + __ATTR(exported_name, S_IRUGO, iscsi_sess_show_##name, NULL) #define ISCSI_SESS_INT_PARAM_ATTR(name, exported_name) \ static ssize_t iscsi_sess_show_##name(struct kobject *kobj, \ @@ -485,7 +485,7 @@ static ssize_t iscsi_sess_show_##name(struct kobject *kobj, \ } \ \ static struct kobj_attribute iscsi_sess_attr_##name = \ - __ATTR(exported_name, S_IRUGO, iscsi_sess_show_##name, NULL); + __ATTR(exported_name, S_IRUGO, iscsi_sess_show_##name, NULL) #define ISCSI_SESS_DIGEST_PARAM_ATTR(name, exported_name) \ static ssize_t iscsi_sess_show_##name(struct kobject *kobj, \ @@ -506,7 +506,7 @@ static ssize_t iscsi_sess_show_##name(struct kobject *kobj, \ } \ \ static struct kobj_attribute iscsi_sess_attr_##name = \ - __ATTR(exported_name, S_IRUGO, iscsi_sess_show_##name, NULL); + __ATTR(exported_name, S_IRUGO, iscsi_sess_show_##name, NULL) ISCSI_SESS_BOOL_PARAM_ATTR(initial_r2t, InitialR2T); ISCSI_SESS_BOOL_PARAM_ATTR(immediate_data, ImmediateData); diff --git a/scst/include/scst.h b/scst/include/scst.h index a31b2e6a8..b35a4d13f 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -4342,7 +4342,7 @@ static inline int cancel_delayed_work_sync(struct delayed_work *work) defined(CONFIG_DEBUG_LOCK_ALLOC) extern struct lockdep_map scst_suspend_dep_map; #define scst_assert_activity_suspended() \ - WARN_ON(debug_locks && !lock_is_held(&scst_suspend_dep_map)); + WARN_ON(debug_locks && !lock_is_held(&scst_suspend_dep_map)) #else /* * See also patch "lockdep: Introduce lockdep_assert_held()" (commit ID diff --git a/scst/src/scst_sysfs.c b/scst/src/scst_sysfs.c index 1e6a84e04..64bfd19ed 100644 --- a/scst/src/scst_sysfs.c +++ b/scst/src/scst_sysfs.c @@ -2572,7 +2572,7 @@ out: \ } \ \ static struct kobj_attribute scst_tgt_##attr##_attr = \ - __ATTR(attr, S_IRUGO, scst_tgt_sysfs_##attr##_show, NULL); + __ATTR(attr, S_IRUGO, scst_tgt_sysfs_##attr##_show, NULL) SCST_TGT_SYSFS_STAT_ATTR(cmd_count, unknown_cmd_count, SCST_DATA_UNKNOWN, >> 0); SCST_TGT_SYSFS_STAT_ATTR(cmd_count, write_cmd_count, SCST_DATA_WRITE, >> 0); @@ -3967,7 +3967,7 @@ static ssize_t scst_sess_sysfs_##exported_name##_store(struct kobject *kobj, \ static struct kobj_attribute session_##exported_name##_attr = \ __ATTR(exported_name, S_IRUGO | S_IWUSR, \ scst_sess_sysfs_##exported_name##_show, \ - scst_sess_sysfs_##exported_name##_store); + scst_sess_sysfs_##exported_name##_store) SCST_SESS_SYSFS_STAT_ATTR(cmd_count, unknown_cmd_count, SCST_DATA_UNKNOWN, 0); SCST_SESS_SYSFS_STAT_ATTR(cmd_count, write_cmd_count, SCST_DATA_WRITE, 0);