From a60f84ebf07863e390b72a2b6150e461a1ec18e9 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sat, 5 Jul 2008 09:18:54 +0000
Subject: *: rename ATTRIBUTE_XXX to just XXX.

---
 modutils/depmod.c         |  4 ++--
 modutils/insmod.c         | 10 +++++-----
 modutils/lsmod.c          |  4 ++--
 modutils/modprobe-small.c |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'modutils')

diff --git a/modutils/depmod.c b/modutils/depmod.c
index 4fba53751..d128ac0ff 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -48,7 +48,7 @@ static char* find_keyword(void *the_module, size_t len, const char * const word)
 	return ptr;
 }
 static int FAST_FUNC fileAction(const char *fname, struct stat *sb,
-					void ATTRIBUTE_UNUSED *data, int ATTRIBUTE_UNUSED depth)
+					void UNUSED_PARAM *data, int UNUSED_PARAM depth)
 {
 	size_t len = sb->st_size;
 	void *the_module;
@@ -110,7 +110,7 @@ static int FAST_FUNC fileAction(const char *fname, struct stat *sb,
 }
 
 int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv)
+int depmod_main(int argc UNUSED_PARAM, char **argv)
 {
 	int ret;
 	size_t moddir_base_len = 0; /* length of the "-b basedir" */
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 8217629b2..d928be27d 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -792,8 +792,8 @@ static char *m_fullName;
 
 
 static int FAST_FUNC check_module_name_match(const char *filename,
-		struct stat *statbuf ATTRIBUTE_UNUSED,
-		void *userdata, int depth ATTRIBUTE_UNUSED)
+		struct stat *statbuf UNUSED_PARAM,
+		void *userdata, int depth UNUSED_PARAM)
 {
 	char *fullname = (char *) userdata;
 	char *tmp;
@@ -3306,7 +3306,7 @@ static int obj_create_image(struct obj_file *f, char *image)
 
 /*======================================================================*/
 
-static struct obj_file *obj_load(FILE *fp, int loadprogbits ATTRIBUTE_UNUSED)
+static struct obj_file *obj_load(FILE *fp, int loadprogbits UNUSED_PARAM)
 {
 	struct obj_file *f;
 	ElfW(Shdr) * section_headers;
@@ -4211,9 +4211,9 @@ static const char *moderror(int err)
 
 #if !ENABLE_FEATURE_2_4_MODULES
 int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int insmod_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int insmod_main(int argc UNUSED_PARAM, char **argv)
 #else
-static int insmod_ng_main(int argc ATTRIBUTE_UNUSED, char **argv)
+static int insmod_ng_main(int argc UNUSED_PARAM, char **argv)
 #endif
 {
 	size_t len;
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index a2330fe98..5e37923a9 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -75,7 +75,7 @@ enum {
 };
 
 int lsmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int lsmod_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	struct module_info info;
 	char *module_names, *mn, *deps, *dn;
@@ -143,7 +143,7 @@ int lsmod_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
 #else /* CONFIG_FEATURE_QUERY_MODULE_INTERFACE */
 
 int lsmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int lsmod_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	FILE *file = xfopen("/proc/modules", "r");
 
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index bbcd9895e..6131d4280 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -301,9 +301,9 @@ static char* pathname_2_modname(const char *pathname)
 }
 
 static FAST_FUNC int fileAction(const char *pathname,
-		struct stat *sb ATTRIBUTE_UNUSED,
+		struct stat *sb UNUSED_PARAM,
 		void *data,
-		int depth ATTRIBUTE_UNUSED)
+		int depth UNUSED_PARAM)
 {
 	int cur;
 	char *name;
@@ -581,7 +581,7 @@ Options:
 */
 
 int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int modprobe_main(int ATTRIBUTE_UNUSED argc, char **argv)
+int modprobe_main(int argc UNUSED_PARAM, char **argv)
 {
 	struct utsname uts;
 	char applet0 = applet_name[0];
-- 
cgit v1.2.3