diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 19:08:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:55 -0400 |
commit | 441b62c1edb986827154768d89bbac0ba779984f (patch) | |
tree | 13724c22d1b190a36f0ddbba38554e6c66bea6af /drivers/usb/misc/emi62.c | |
parent | 14722ef4acedc643f0b78b7165ceff2d300dae4d (diff) |
USB: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc/emi62.c')
-rw-r--r-- | drivers/usb/misc/emi62.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c index d1362415922c..1a2b79ac5e10 100644 --- a/drivers/usb/misc/emi62.c +++ b/drivers/usb/misc/emi62.c | |||
@@ -78,7 +78,7 @@ static int emi62_writememory (struct usb_device *dev, int address, unsigned char | |||
78 | static int emi62_set_reset (struct usb_device *dev, unsigned char reset_bit) | 78 | static int emi62_set_reset (struct usb_device *dev, unsigned char reset_bit) |
79 | { | 79 | { |
80 | int response; | 80 | int response; |
81 | info("%s - %d", __FUNCTION__, reset_bit); | 81 | info("%s - %d", __func__, reset_bit); |
82 | 82 | ||
83 | response = emi62_writememory (dev, CPUCS_REG, &reset_bit, 1, 0xa0); | 83 | response = emi62_writememory (dev, CPUCS_REG, &reset_bit, 1, 0xa0); |
84 | if (response < 0) { | 84 | if (response < 0) { |
@@ -100,7 +100,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
100 | dev_dbg(&dev->dev, "load_firmware\n"); | 100 | dev_dbg(&dev->dev, "load_firmware\n"); |
101 | buf = kmalloc(FW_LOAD_SIZE, GFP_KERNEL); | 101 | buf = kmalloc(FW_LOAD_SIZE, GFP_KERNEL); |
102 | if (!buf) { | 102 | if (!buf) { |
103 | err( "%s - error loading firmware: error = %d", __FUNCTION__, -ENOMEM); | 103 | err( "%s - error loading firmware: error = %d", __func__, -ENOMEM); |
104 | err = -ENOMEM; | 104 | err = -ENOMEM; |
105 | goto wraperr; | 105 | goto wraperr; |
106 | } | 106 | } |
@@ -108,7 +108,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
108 | /* Assert reset (stop the CPU in the EMI) */ | 108 | /* Assert reset (stop the CPU in the EMI) */ |
109 | err = emi62_set_reset(dev,1); | 109 | err = emi62_set_reset(dev,1); |
110 | if (err < 0) { | 110 | if (err < 0) { |
111 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 111 | err("%s - error loading firmware: error = %d", __func__, err); |
112 | goto wraperr; | 112 | goto wraperr; |
113 | } | 113 | } |
114 | 114 | ||
@@ -116,7 +116,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
116 | for (i=0; g_emi62_loader[i].type == 0; i++) { | 116 | for (i=0; g_emi62_loader[i].type == 0; i++) { |
117 | err = emi62_writememory(dev, g_emi62_loader[i].address, g_emi62_loader[i].data, g_emi62_loader[i].length, ANCHOR_LOAD_INTERNAL); | 117 | err = emi62_writememory(dev, g_emi62_loader[i].address, g_emi62_loader[i].data, g_emi62_loader[i].length, ANCHOR_LOAD_INTERNAL); |
118 | if (err < 0) { | 118 | if (err < 0) { |
119 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 119 | err("%s - error loading firmware: error = %d", __func__, err); |
120 | goto wraperr; | 120 | goto wraperr; |
121 | } | 121 | } |
122 | } | 122 | } |
@@ -124,7 +124,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
124 | /* De-assert reset (let the CPU run) */ | 124 | /* De-assert reset (let the CPU run) */ |
125 | err = emi62_set_reset(dev,0); | 125 | err = emi62_set_reset(dev,0); |
126 | if (err < 0) { | 126 | if (err < 0) { |
127 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 127 | err("%s - error loading firmware: error = %d", __func__, err); |
128 | goto wraperr; | 128 | goto wraperr; |
129 | } | 129 | } |
130 | msleep(250); /* let device settle */ | 130 | msleep(250); /* let device settle */ |
@@ -144,7 +144,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
144 | } | 144 | } |
145 | err = emi62_writememory(dev, addr, buf, i, ANCHOR_LOAD_FPGA); | 145 | err = emi62_writememory(dev, addr, buf, i, ANCHOR_LOAD_FPGA); |
146 | if (err < 0) { | 146 | if (err < 0) { |
147 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 147 | err("%s - error loading firmware: error = %d", __func__, err); |
148 | goto wraperr; | 148 | goto wraperr; |
149 | } | 149 | } |
150 | } while (i > 0); | 150 | } while (i > 0); |
@@ -152,7 +152,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
152 | /* Assert reset (stop the CPU in the EMI) */ | 152 | /* Assert reset (stop the CPU in the EMI) */ |
153 | err = emi62_set_reset(dev,1); | 153 | err = emi62_set_reset(dev,1); |
154 | if (err < 0) { | 154 | if (err < 0) { |
155 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 155 | err("%s - error loading firmware: error = %d", __func__, err); |
156 | goto wraperr; | 156 | goto wraperr; |
157 | } | 157 | } |
158 | 158 | ||
@@ -160,7 +160,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
160 | for (i=0; g_emi62_loader[i].type == 0; i++) { | 160 | for (i=0; g_emi62_loader[i].type == 0; i++) { |
161 | err = emi62_writememory(dev, g_emi62_loader[i].address, g_emi62_loader[i].data, g_emi62_loader[i].length, ANCHOR_LOAD_INTERNAL); | 161 | err = emi62_writememory(dev, g_emi62_loader[i].address, g_emi62_loader[i].data, g_emi62_loader[i].length, ANCHOR_LOAD_INTERNAL); |
162 | if (err < 0) { | 162 | if (err < 0) { |
163 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 163 | err("%s - error loading firmware: error = %d", __func__, err); |
164 | goto wraperr; | 164 | goto wraperr; |
165 | } | 165 | } |
166 | } | 166 | } |
@@ -168,7 +168,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
168 | /* De-assert reset (let the CPU run) */ | 168 | /* De-assert reset (let the CPU run) */ |
169 | err = emi62_set_reset(dev,0); | 169 | err = emi62_set_reset(dev,0); |
170 | if (err < 0) { | 170 | if (err < 0) { |
171 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 171 | err("%s - error loading firmware: error = %d", __func__, err); |
172 | goto wraperr; | 172 | goto wraperr; |
173 | } | 173 | } |
174 | msleep(250); /* let device settle */ | 174 | msleep(250); /* let device settle */ |
@@ -181,7 +181,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
181 | if (!INTERNAL_RAM(g_HexSpdifFw62[i].address)) { | 181 | if (!INTERNAL_RAM(g_HexSpdifFw62[i].address)) { |
182 | err = emi62_writememory(dev, g_HexSpdifFw62[i].address, g_HexSpdifFw62[i].data, g_HexSpdifFw62[i].length, ANCHOR_LOAD_EXTERNAL); | 182 | err = emi62_writememory(dev, g_HexSpdifFw62[i].address, g_HexSpdifFw62[i].data, g_HexSpdifFw62[i].length, ANCHOR_LOAD_EXTERNAL); |
183 | if (err < 0) { | 183 | if (err < 0) { |
184 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 184 | err("%s - error loading firmware: error = %d", __func__, err); |
185 | goto wraperr; | 185 | goto wraperr; |
186 | } | 186 | } |
187 | } | 187 | } |
@@ -191,7 +191,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
191 | if (!INTERNAL_RAM(g_HexMidiFw62[i].address)) { | 191 | if (!INTERNAL_RAM(g_HexMidiFw62[i].address)) { |
192 | err = emi62_writememory(dev, g_HexMidiFw62[i].address, g_HexMidiFw62[i].data, g_HexMidiFw62[i].length, ANCHOR_LOAD_EXTERNAL); | 192 | err = emi62_writememory(dev, g_HexMidiFw62[i].address, g_HexMidiFw62[i].data, g_HexMidiFw62[i].length, ANCHOR_LOAD_EXTERNAL); |
193 | if (err < 0) { | 193 | if (err < 0) { |
194 | err("%s - error loading firmware: error = %d\n", __FUNCTION__, err); | 194 | err("%s - error loading firmware: error = %d\n", __func__, err); |
195 | goto wraperr; | 195 | goto wraperr; |
196 | return err; | 196 | return err; |
197 | } | 197 | } |
@@ -201,7 +201,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
201 | /* Assert reset (stop the CPU in the EMI) */ | 201 | /* Assert reset (stop the CPU in the EMI) */ |
202 | err = emi62_set_reset(dev,1); | 202 | err = emi62_set_reset(dev,1); |
203 | if (err < 0) { | 203 | if (err < 0) { |
204 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 204 | err("%s - error loading firmware: error = %d", __func__, err); |
205 | goto wraperr; | 205 | goto wraperr; |
206 | } | 206 | } |
207 | 207 | ||
@@ -211,7 +211,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
211 | if (INTERNAL_RAM(g_HexSpdifFw62[i].address)) { | 211 | if (INTERNAL_RAM(g_HexSpdifFw62[i].address)) { |
212 | err = emi62_writememory(dev, g_HexSpdifFw62[i].address, g_HexSpdifFw62[i].data, g_HexSpdifFw62[i].length, ANCHOR_LOAD_INTERNAL); | 212 | err = emi62_writememory(dev, g_HexSpdifFw62[i].address, g_HexSpdifFw62[i].data, g_HexSpdifFw62[i].length, ANCHOR_LOAD_INTERNAL); |
213 | if (err < 0) { | 213 | if (err < 0) { |
214 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 214 | err("%s - error loading firmware: error = %d", __func__, err); |
215 | goto wraperr; | 215 | goto wraperr; |
216 | } | 216 | } |
217 | } | 217 | } |
@@ -221,7 +221,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
221 | if (INTERNAL_RAM(g_HexMidiFw62[i].address)) { | 221 | if (INTERNAL_RAM(g_HexMidiFw62[i].address)) { |
222 | err = emi62_writememory(dev, g_HexMidiFw62[i].address, g_HexMidiFw62[i].data, g_HexMidiFw62[i].length, ANCHOR_LOAD_INTERNAL); | 222 | err = emi62_writememory(dev, g_HexMidiFw62[i].address, g_HexMidiFw62[i].data, g_HexMidiFw62[i].length, ANCHOR_LOAD_INTERNAL); |
223 | if (err < 0) { | 223 | if (err < 0) { |
224 | err("%s - error loading firmware: error = %d\n", __FUNCTION__, err); | 224 | err("%s - error loading firmware: error = %d\n", __func__, err); |
225 | goto wraperr; | 225 | goto wraperr; |
226 | } | 226 | } |
227 | } | 227 | } |
@@ -231,7 +231,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
231 | /* De-assert reset (let the CPU run) */ | 231 | /* De-assert reset (let the CPU run) */ |
232 | err = emi62_set_reset(dev,0); | 232 | err = emi62_set_reset(dev,0); |
233 | if (err < 0) { | 233 | if (err < 0) { |
234 | err("%s - error loading firmware: error = %d", __FUNCTION__, err); | 234 | err("%s - error loading firmware: error = %d", __func__, err); |
235 | goto wraperr; | 235 | goto wraperr; |
236 | } | 236 | } |
237 | msleep(250); /* let device settle */ | 237 | msleep(250); /* let device settle */ |
@@ -260,7 +260,7 @@ static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
260 | struct usb_device *dev = interface_to_usbdev(intf); | 260 | struct usb_device *dev = interface_to_usbdev(intf); |
261 | dev_dbg(&intf->dev, "emi62_probe\n"); | 261 | dev_dbg(&intf->dev, "emi62_probe\n"); |
262 | 262 | ||
263 | info("%s start", __FUNCTION__); | 263 | info("%s start", __func__); |
264 | 264 | ||
265 | emi62_load_firmware(dev); | 265 | emi62_load_firmware(dev); |
266 | 266 | ||