aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/highlevel.c6
-rw-r--r--drivers/ieee1394/ieee1394_core.c2
-rw-r--r--drivers/ieee1394/ohci1394.c2
-rw-r--r--drivers/ieee1394/pcilynx.c12
-rw-r--r--drivers/ieee1394/sbp2.c4
5 files changed, 13 insertions, 13 deletions
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index b6425469b6ee..fa2bfec0fca2 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -339,7 +339,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
339 if ((alignment & 3) || (alignment > 0x800000000000ULL) || 339 if ((alignment & 3) || (alignment > 0x800000000000ULL) ||
340 (hweight64(alignment) != 1)) { 340 (hweight64(alignment) != 1)) {
341 HPSB_ERR("%s called with invalid alignment: 0x%048llx", 341 HPSB_ERR("%s called with invalid alignment: 0x%048llx",
342 __FUNCTION__, (unsigned long long)alignment); 342 __func__, (unsigned long long)alignment);
343 return retval; 343 return retval;
344 } 344 }
345 345
@@ -354,7 +354,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
354 if (((start|end) & ~align_mask) || (start >= end) || 354 if (((start|end) & ~align_mask) || (start >= end) ||
355 (end > CSR1212_ALL_SPACE_END)) { 355 (end > CSR1212_ALL_SPACE_END)) {
356 HPSB_ERR("%s called with invalid addresses " 356 HPSB_ERR("%s called with invalid addresses "
357 "(start = %012Lx end = %012Lx)", __FUNCTION__, 357 "(start = %012Lx end = %012Lx)", __func__,
358 (unsigned long long)start,(unsigned long long)end); 358 (unsigned long long)start,(unsigned long long)end);
359 return retval; 359 return retval;
360 } 360 }
@@ -422,7 +422,7 @@ int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
422 422
423 if (((start|end) & 3) || (start >= end) || 423 if (((start|end) & 3) || (start >= end) ||
424 (end > CSR1212_ALL_SPACE_END)) { 424 (end > CSR1212_ALL_SPACE_END)) {
425 HPSB_ERR("%s called with invalid addresses", __FUNCTION__); 425 HPSB_ERR("%s called with invalid addresses", __func__);
426 return 0; 426 return 0;
427 } 427 }
428 428
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index 36c747b277d0..942bf1ff5214 100644
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -242,7 +242,7 @@ int hpsb_bus_reset(struct hpsb_host *host)
242{ 242{
243 if (host->in_bus_reset) { 243 if (host->in_bus_reset) {
244 HPSB_NOTICE("%s called while bus reset already in progress", 244 HPSB_NOTICE("%s called while bus reset already in progress",
245 __FUNCTION__); 245 __func__);
246 return 1; 246 return 1;
247 } 247 }
248 248
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 29b891084ca7..0808baea7390 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -708,7 +708,7 @@ static void insert_packet(struct ti_ohci *ohci,
708 /* FIXME: do something about it */ 708 /* FIXME: do something about it */
709 PRINT(KERN_ERR, 709 PRINT(KERN_ERR,
710 "%s: packet data addr: %p size %Zd bytes " 710 "%s: packet data addr: %p size %Zd bytes "
711 "cross page boundary", __FUNCTION__, 711 "cross page boundary", __func__,
712 packet->data, packet->data_size); 712 packet->data, packet->data_size);
713 } 713 }
714#endif 714#endif
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 8af01ab30cc9..9c35e0d498cb 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -226,7 +226,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr)
226 if (addr > 15) { 226 if (addr > 15) {
227 PRINT(KERN_ERR, lynx->id, 227 PRINT(KERN_ERR, lynx->id,
228 "%s: PHY register address %d out of range", 228 "%s: PHY register address %d out of range",
229 __FUNCTION__, addr); 229 __func__, addr);
230 return -1; 230 return -1;
231 } 231 }
232 232
@@ -238,7 +238,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr)
238 238
239 if (i > 10000) { 239 if (i > 10000) {
240 PRINT(KERN_ERR, lynx->id, "%s: runaway loop, aborting", 240 PRINT(KERN_ERR, lynx->id, "%s: runaway loop, aborting",
241 __FUNCTION__); 241 __func__);
242 retval = -1; 242 retval = -1;
243 break; 243 break;
244 } 244 }
@@ -261,13 +261,13 @@ static int set_phy_reg(struct ti_lynx *lynx, int addr, int val)
261 261
262 if (addr > 15) { 262 if (addr > 15) {
263 PRINT(KERN_ERR, lynx->id, 263 PRINT(KERN_ERR, lynx->id,
264 "%s: PHY register address %d out of range", __FUNCTION__, addr); 264 "%s: PHY register address %d out of range", __func__, addr);
265 return -1; 265 return -1;
266 } 266 }
267 267
268 if (val > 0xff) { 268 if (val > 0xff) {
269 PRINT(KERN_ERR, lynx->id, 269 PRINT(KERN_ERR, lynx->id,
270 "%s: PHY register value %d out of range", __FUNCTION__, val); 270 "%s: PHY register value %d out of range", __func__, val);
271 return -1; 271 return -1;
272 } 272 }
273 273
@@ -287,7 +287,7 @@ static int sel_phy_reg_page(struct ti_lynx *lynx, int page)
287 287
288 if (page > 7) { 288 if (page > 7) {
289 PRINT(KERN_ERR, lynx->id, 289 PRINT(KERN_ERR, lynx->id,
290 "%s: PHY page %d out of range", __FUNCTION__, page); 290 "%s: PHY page %d out of range", __func__, page);
291 return -1; 291 return -1;
292 } 292 }
293 293
@@ -309,7 +309,7 @@ static int sel_phy_reg_port(struct ti_lynx *lynx, int port)
309 309
310 if (port > 15) { 310 if (port > 15) {
311 PRINT(KERN_ERR, lynx->id, 311 PRINT(KERN_ERR, lynx->id,
312 "%s: PHY port %d out of range", __FUNCTION__, port); 312 "%s: PHY port %d out of range", __func__, port);
313 return -1; 313 return -1;
314 } 314 }
315 315
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 5f713a01f044..16b9d0ad154e 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -615,7 +615,7 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb(
615 cmd->Current_SCpnt = Current_SCpnt; 615 cmd->Current_SCpnt = Current_SCpnt;
616 list_add_tail(&cmd->list, &lu->cmd_orb_inuse); 616 list_add_tail(&cmd->list, &lu->cmd_orb_inuse);
617 } else 617 } else
618 SBP2_ERR("%s: no orbs available", __FUNCTION__); 618 SBP2_ERR("%s: no orbs available", __func__);
619 spin_unlock_irqrestore(&lu->cmd_orb_lock, flags); 619 spin_unlock_irqrestore(&lu->cmd_orb_lock, flags);
620 return cmd; 620 return cmd;
621} 621}
@@ -1294,7 +1294,7 @@ static int sbp2_set_busy_timeout(struct sbp2_lu *lu)
1294 1294
1295 data = cpu_to_be32(SBP2_BUSY_TIMEOUT_VALUE); 1295 data = cpu_to_be32(SBP2_BUSY_TIMEOUT_VALUE);
1296 if (hpsb_node_write(lu->ne, SBP2_BUSY_TIMEOUT_ADDRESS, &data, 4)) 1296 if (hpsb_node_write(lu->ne, SBP2_BUSY_TIMEOUT_ADDRESS, &data, 4))
1297 SBP2_ERR("%s error", __FUNCTION__); 1297 SBP2_ERR("%s error", __func__);
1298 return 0; 1298 return 0;
1299} 1299}
1300 1300