diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:15:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:42 -0400 |
commit | e46b272b6608783ed7aa7b0594871550ce20b849 (patch) | |
tree | a65834f60bee7e77f9669a7ff7e95a1ec3cd74ee /drivers/md/dm-uevent.c | |
parent | 9a7b2b0f36c40beeb252cb5ceff36bb295e88d97 (diff) |
md: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/md/dm-uevent.c')
-rw-r--r-- | drivers/md/dm-uevent.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/md/dm-uevent.c b/drivers/md/dm-uevent.c index 50377e5dc2a3..6f65883aef12 100644 --- a/drivers/md/dm-uevent.c +++ b/drivers/md/dm-uevent.c | |||
@@ -78,7 +78,7 @@ static struct dm_uevent *dm_build_path_uevent(struct mapped_device *md, | |||
78 | 78 | ||
79 | event = dm_uevent_alloc(md); | 79 | event = dm_uevent_alloc(md); |
80 | if (!event) { | 80 | if (!event) { |
81 | DMERR("%s: dm_uevent_alloc() failed", __FUNCTION__); | 81 | DMERR("%s: dm_uevent_alloc() failed", __func__); |
82 | goto err_nomem; | 82 | goto err_nomem; |
83 | } | 83 | } |
84 | 84 | ||
@@ -86,32 +86,32 @@ static struct dm_uevent *dm_build_path_uevent(struct mapped_device *md, | |||
86 | 86 | ||
87 | if (add_uevent_var(&event->ku_env, "DM_TARGET=%s", ti->type->name)) { | 87 | if (add_uevent_var(&event->ku_env, "DM_TARGET=%s", ti->type->name)) { |
88 | DMERR("%s: add_uevent_var() for DM_TARGET failed", | 88 | DMERR("%s: add_uevent_var() for DM_TARGET failed", |
89 | __FUNCTION__); | 89 | __func__); |
90 | goto err_add; | 90 | goto err_add; |
91 | } | 91 | } |
92 | 92 | ||
93 | if (add_uevent_var(&event->ku_env, "DM_ACTION=%s", dm_action)) { | 93 | if (add_uevent_var(&event->ku_env, "DM_ACTION=%s", dm_action)) { |
94 | DMERR("%s: add_uevent_var() for DM_ACTION failed", | 94 | DMERR("%s: add_uevent_var() for DM_ACTION failed", |
95 | __FUNCTION__); | 95 | __func__); |
96 | goto err_add; | 96 | goto err_add; |
97 | } | 97 | } |
98 | 98 | ||
99 | if (add_uevent_var(&event->ku_env, "DM_SEQNUM=%u", | 99 | if (add_uevent_var(&event->ku_env, "DM_SEQNUM=%u", |
100 | dm_next_uevent_seq(md))) { | 100 | dm_next_uevent_seq(md))) { |
101 | DMERR("%s: add_uevent_var() for DM_SEQNUM failed", | 101 | DMERR("%s: add_uevent_var() for DM_SEQNUM failed", |
102 | __FUNCTION__); | 102 | __func__); |
103 | goto err_add; | 103 | goto err_add; |
104 | } | 104 | } |
105 | 105 | ||
106 | if (add_uevent_var(&event->ku_env, "DM_PATH=%s", path)) { | 106 | if (add_uevent_var(&event->ku_env, "DM_PATH=%s", path)) { |
107 | DMERR("%s: add_uevent_var() for DM_PATH failed", __FUNCTION__); | 107 | DMERR("%s: add_uevent_var() for DM_PATH failed", __func__); |
108 | goto err_add; | 108 | goto err_add; |
109 | } | 109 | } |
110 | 110 | ||
111 | if (add_uevent_var(&event->ku_env, "DM_NR_VALID_PATHS=%d", | 111 | if (add_uevent_var(&event->ku_env, "DM_NR_VALID_PATHS=%d", |
112 | nr_valid_paths)) { | 112 | nr_valid_paths)) { |
113 | DMERR("%s: add_uevent_var() for DM_NR_VALID_PATHS failed", | 113 | DMERR("%s: add_uevent_var() for DM_NR_VALID_PATHS failed", |
114 | __FUNCTION__); | 114 | __func__); |
115 | goto err_add; | 115 | goto err_add; |
116 | } | 116 | } |
117 | 117 | ||
@@ -146,25 +146,25 @@ void dm_send_uevents(struct list_head *events, struct kobject *kobj) | |||
146 | if (dm_copy_name_and_uuid(event->md, event->name, | 146 | if (dm_copy_name_and_uuid(event->md, event->name, |
147 | event->uuid)) { | 147 | event->uuid)) { |
148 | DMERR("%s: dm_copy_name_and_uuid() failed", | 148 | DMERR("%s: dm_copy_name_and_uuid() failed", |
149 | __FUNCTION__); | 149 | __func__); |
150 | goto uevent_free; | 150 | goto uevent_free; |
151 | } | 151 | } |
152 | 152 | ||
153 | if (add_uevent_var(&event->ku_env, "DM_NAME=%s", event->name)) { | 153 | if (add_uevent_var(&event->ku_env, "DM_NAME=%s", event->name)) { |
154 | DMERR("%s: add_uevent_var() for DM_NAME failed", | 154 | DMERR("%s: add_uevent_var() for DM_NAME failed", |
155 | __FUNCTION__); | 155 | __func__); |
156 | goto uevent_free; | 156 | goto uevent_free; |
157 | } | 157 | } |
158 | 158 | ||
159 | if (add_uevent_var(&event->ku_env, "DM_UUID=%s", event->uuid)) { | 159 | if (add_uevent_var(&event->ku_env, "DM_UUID=%s", event->uuid)) { |
160 | DMERR("%s: add_uevent_var() for DM_UUID failed", | 160 | DMERR("%s: add_uevent_var() for DM_UUID failed", |
161 | __FUNCTION__); | 161 | __func__); |
162 | goto uevent_free; | 162 | goto uevent_free; |
163 | } | 163 | } |
164 | 164 | ||
165 | r = kobject_uevent_env(kobj, event->action, event->ku_env.envp); | 165 | r = kobject_uevent_env(kobj, event->action, event->ku_env.envp); |
166 | if (r) | 166 | if (r) |
167 | DMERR("%s: kobject_uevent_env failed", __FUNCTION__); | 167 | DMERR("%s: kobject_uevent_env failed", __func__); |
168 | uevent_free: | 168 | uevent_free: |
169 | dm_uevent_free(event); | 169 | dm_uevent_free(event); |
170 | } | 170 | } |
@@ -187,7 +187,7 @@ void dm_path_uevent(enum dm_uevent_type event_type, struct dm_target *ti, | |||
187 | struct dm_uevent *event; | 187 | struct dm_uevent *event; |
188 | 188 | ||
189 | if (event_type >= ARRAY_SIZE(_dm_uevent_type_names)) { | 189 | if (event_type >= ARRAY_SIZE(_dm_uevent_type_names)) { |
190 | DMERR("%s: Invalid event_type %d", __FUNCTION__, event_type); | 190 | DMERR("%s: Invalid event_type %d", __func__, event_type); |
191 | goto out; | 191 | goto out; |
192 | } | 192 | } |
193 | 193 | ||