Commit b1ce1fd7 authored by Harvey Harrison's avatar Harvey Harrison Committed by Stefan Richter
Browse files

ieee1394: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent b25d1666

drivers/ieee1394/highlevel.c

+3 −3
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl, 
	if ((alignment & 3) || (alignment > 0x800000000000ULL) ||

	    (hweight64(alignment) != 1)) {

		HPSB_ERR("%s called with invalid alignment: 0x%048llx",

			 __FUNCTION__, (unsigned long long)alignment);

			 __func__, (unsigned long long)alignment);

		return retval;

	}
@@ -354,7 +354,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl, 
	if (((start|end) & ~align_mask) || (start >= end) ||

	    (end > CSR1212_ALL_SPACE_END)) {

		HPSB_ERR("%s called with invalid addresses "

			 "(start = %012Lx  end = %012Lx)", __FUNCTION__,

			 "(start = %012Lx  end = %012Lx)", __func__,

			 (unsigned long long)start,(unsigned long long)end);

		return retval;

	}
@@ -422,7 +422,7 @@ int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host, 


	if (((start|end) & 3) || (start >= end) ||

	    (end > CSR1212_ALL_SPACE_END)) {

		HPSB_ERR("%s called with invalid addresses", __FUNCTION__);

		HPSB_ERR("%s called with invalid addresses", __func__);

		return 0;

	}

drivers/ieee1394/ieee1394_core.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ int hpsb_bus_reset(struct hpsb_host *host) 
{

	if (host->in_bus_reset) {

		HPSB_NOTICE("%s called while bus reset already in progress",

			    __FUNCTION__);

			    __func__);

		return 1;

	}

drivers/ieee1394/ohci1394.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static void insert_packet(struct ti_ohci *ohci, 
                                /* FIXME: do something about it */

                                PRINT(KERN_ERR,

                                      "%s: packet data addr: %p size %Zd bytes "

                                      "cross page boundary", __FUNCTION__,

				      "cross page boundary", __func__,

                                      packet->data, packet->data_size);

                        }

#endif

drivers/ieee1394/pcilynx.c

+6 −6
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr) 
        if (addr > 15) {

                PRINT(KERN_ERR, lynx->id,

                      "%s: PHY register address %d out of range",

		      __FUNCTION__, addr);

		      __func__, addr);

                return -1;

        }
@@ -238,7 +238,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr) 


                if (i > 10000) {

                        PRINT(KERN_ERR, lynx->id, "%s: runaway loop, aborting",

			      __FUNCTION__);

			      __func__);

                        retval = -1;

                        break;

                }
@@ -261,13 +261,13 @@ static int set_phy_reg(struct ti_lynx *lynx, int addr, int val) 


        if (addr > 15) {

                PRINT(KERN_ERR, lynx->id,

                      "%s: PHY register address %d out of range", __FUNCTION__, addr);

		      "%s: PHY register address %d out of range", __func__, addr);

                return -1;

        }



        if (val > 0xff) {

                PRINT(KERN_ERR, lynx->id,

                      "%s: PHY register value %d out of range", __FUNCTION__, val);

		      "%s: PHY register value %d out of range", __func__, val);

                return -1;

        }
@@ -287,7 +287,7 @@ static int sel_phy_reg_page(struct ti_lynx *lynx, int page) 


        if (page > 7) {

                PRINT(KERN_ERR, lynx->id,

                      "%s: PHY page %d out of range", __FUNCTION__, page);

		      "%s: PHY page %d out of range", __func__, page);

                return -1;

        }
@@ -309,7 +309,7 @@ static int sel_phy_reg_port(struct ti_lynx *lynx, int port) 


        if (port > 15) {

                PRINT(KERN_ERR, lynx->id,

                      "%s: PHY port %d out of range", __FUNCTION__, port);

		      "%s: PHY port %d out of range", __func__, port);

                return -1;

        }

drivers/ieee1394/sbp2.c

+2 −2
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb( 
		cmd->Current_SCpnt = Current_SCpnt;

		list_add_tail(&cmd->list, &lu->cmd_orb_inuse);

	} else

		SBP2_ERR("%s: no orbs available", __FUNCTION__);

		SBP2_ERR("%s: no orbs available", __func__);

	spin_unlock_irqrestore(&lu->cmd_orb_lock, flags);

	return cmd;

}
@@ -1294,7 +1294,7 @@ static int sbp2_set_busy_timeout(struct sbp2_lu *lu) 


	data = cpu_to_be32(SBP2_BUSY_TIMEOUT_VALUE);

	if (hpsb_node_write(lu->ne, SBP2_BUSY_TIMEOUT_ADDRESS, &data, 4))

		SBP2_ERR("%s error", __FUNCTION__);

		SBP2_ERR("%s error", __func__);

	return 0;

}