[PATCH 2/5] drivers/scsi/aic94xx/: replace __FUNCTION__ with __func__ - Kernel

This is a discussion on [PATCH 2/5] drivers/scsi/aic94xx/: replace __FUNCTION__ with __func__ - Kernel ; Signed-off-by: Denis ChengRq --- drivers/scsi/aic94xx/aic94xx.h | 4 +- drivers/scsi/aic94xx/aic94xx_hwi.c | 2 +- drivers/scsi/aic94xx/aic94xx_scb.c | 46 +++++++++++++++++----------------- drivers/scsi/aic94xx/aic94xx_task.c | 2 +- drivers/scsi/aic94xx/aic94xx_tmf.c | 18 +++++++------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx.h b/drivers/scsi/aic94xx/aic94xx.h index 2ef459e..2863a9d 100644 --- a/drivers/scsi/aic94xx/aic94xx.h ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: [PATCH 2/5] drivers/scsi/aic94xx/: replace __FUNCTION__ with __func__

  1. [PATCH 2/5] drivers/scsi/aic94xx/: replace __FUNCTION__ with __func__

    Signed-off-by: Denis ChengRq
    ---
    drivers/scsi/aic94xx/aic94xx.h | 4 +-
    drivers/scsi/aic94xx/aic94xx_hwi.c | 2 +-
    drivers/scsi/aic94xx/aic94xx_scb.c | 46 +++++++++++++++++-----------------
    drivers/scsi/aic94xx/aic94xx_task.c | 2 +-
    drivers/scsi/aic94xx/aic94xx_tmf.c | 18 +++++++-------
    5 files changed, 36 insertions(+), 36 deletions(-)

    diff --git a/drivers/scsi/aic94xx/aic94xx.h b/drivers/scsi/aic94xx/aic94xx.h
    index 2ef459e..2863a9d 100644
    --- a/drivers/scsi/aic94xx/aic94xx.h
    +++ b/drivers/scsi/aic94xx/aic94xx.h
    @@ -39,9 +39,9 @@

    #ifdef ASD_ENTER_EXIT
    #define ENTER printk(KERN_NOTICE "%s: ENTER %s\n", ASD_DRIVER_NAME, \
    - __FUNCTION__)
    + __func__)
    #define EXIT printk(KERN_NOTICE "%s: --EXIT %s\n", ASD_DRIVER_NAME, \
    - __FUNCTION__)
    + __func__)
    #else
    #define ENTER
    #define EXIT
    diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c
    index 83a7822..eb9dc31 100644
    --- a/drivers/scsi/aic94xx/aic94xx_hwi.c
    +++ b/drivers/scsi/aic94xx/aic94xx_hwi.c
    @@ -1359,7 +1359,7 @@ int asd_enable_phys(struct asd_ha_struct *asd_ha, const u8 phy_mask)
    struct asd_ascb *ascb_list;

    if (!phy_mask) {
    - asd_printk("%s called with phy_mask of 0!?\n", __FUNCTION__);
    + asd_printk("%s called with phy_mask of 0!?\n", __func__);
    return 0;
    }

    diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
    index 4664331..7851f3c 100644
    --- a/drivers/scsi/aic94xx/aic94xx_scb.c
    +++ b/drivers/scsi/aic94xx/aic94xx_scb.c
    @@ -211,7 +211,7 @@ static void asd_form_port(struct asd_ha_struct *asd_ha, struct asd_phy *phy)
    phy->asd_port = port;
    }
    ASD_DPRINTK("%s: updating phy_mask 0x%x for phy%d\n",
    - __FUNCTION__, phy->asd_port->phy_mask, sas_phy->id);
    + __func__, phy->asd_port->phy_mask, sas_phy->id);
    asd_update_port_links(asd_ha, phy);
    spin_unlock_irqrestore(&asd_ha->asd_ports_lock, flags);
    }
    @@ -294,7 +294,7 @@ static void asd_link_reset_err_tasklet(struct asd_ascb *ascb,
    struct asd_ascb *cp = asd_ascb_alloc_list(ascb->ha, &num,
    GFP_ATOMIC);
    if (!cp) {
    - asd_printk("%s: out of memory\n", __FUNCTION__);
    + asd_printk("%s: out of memory\n", __func__);
    goto out;
    }
    ASD_DPRINTK("phy%d: retries:0 performing link reset seq\n",
    @@ -446,7 +446,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
    struct domain_device *failed_dev = NULL;

    ASD_DPRINTK("%s: REQ_TASK_ABORT, reason=0x%X\n",
    - __FUNCTION__, dl->status_block[3]);
    + __func__, dl->status_block[3]);

    /*
    * Find the task that caused the abort and abort it first.
    @@ -474,7 +474,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,

    if (!failed_dev) {
    ASD_DPRINTK("%s: Can't find task (tc=%d) to abort!\n",
    - __FUNCTION__, tc_abort);
    + __func__, tc_abort);
    goto out;
    }

    @@ -502,7 +502,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
    conn_handle = *((u16*)(&dl->status_block[1]));
    conn_handle = le16_to_cpu(conn_handle);

    - ASD_DPRINTK("%s: REQ_DEVICE_RESET, reason=0x%X\n", __FUNCTION__,
    + ASD_DPRINTK("%s: REQ_DEVICE_RESET, reason=0x%X\n", __func__,
    dl->status_block[3]);

    /* Find the last pending task for the device... */
    @@ -522,7 +522,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,

    if (!last_dev_task) {
    ASD_DPRINTK("%s: Device reset for idle device %d?\n",
    - __FUNCTION__, conn_handle);
    + __func__, conn_handle);
    goto out;
    }

    @@ -549,10 +549,10 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
    goto out;
    }
    case SIGNAL_NCQ_ERROR:
    - ASD_DPRINTK("%s: SIGNAL_NCQ_ERROR\n", __FUNCTION__);
    + ASD_DPRINTK("%s: SIGNAL_NCQ_ERROR\n", __func__);
    goto out;
    case CLEAR_NCQ_ERROR:
    - ASD_DPRINTK("%s: CLEAR_NCQ_ERROR\n", __FUNCTION__);
    + ASD_DPRINTK("%s: CLEAR_NCQ_ERROR\n", __func__);
    goto out;
    }

    @@ -560,26 +560,26 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,

    switch (sb_opcode) {
    case BYTES_DMAED:
    - ASD_DPRINTK("%s: phy%d: BYTES_DMAED\n", __FUNCTION__, phy_id);
    + ASD_DPRINTK("%s: phy%d: BYTES_DMAED\n", __func__, phy_id);
    asd_bytes_dmaed_tasklet(ascb, dl, edb, phy_id);
    break;
    case PRIMITIVE_RECVD:
    - ASD_DPRINTK("%s: phy%d: PRIMITIVE_RECVD\n", __FUNCTION__,
    + ASD_DPRINTK("%s: phy%d: PRIMITIVE_RECVD\n", __func__,
    phy_id);
    asd_primitive_rcvd_tasklet(ascb, dl, phy_id);
    break;
    case PHY_EVENT:
    - ASD_DPRINTK("%s: phy%d: PHY_EVENT\n", __FUNCTION__, phy_id);
    + ASD_DPRINTK("%s: phy%d: PHY_EVENT\n", __func__, phy_id);
    asd_phy_event_tasklet(ascb, dl);
    break;
    case LINK_RESET_ERROR:
    - ASD_DPRINTK("%s: phy%d: LINK_RESET_ERROR\n", __FUNCTION__,
    + ASD_DPRINTK("%s: phy%d: LINK_RESET_ERROR\n", __func__,
    phy_id);
    asd_link_reset_err_tasklet(ascb, dl, phy_id);
    break;
    case TIMER_EVENT:
    ASD_DPRINTK("%s: phy%d: TIMER_EVENT, lost dw sync\n",
    - __FUNCTION__, phy_id);
    + __func__, phy_id);
    asd_turn_led(asd_ha, phy_id, 0);
    /* the device is gone */
    sas_phy_disconnected(sas_phy);
    @@ -587,7 +587,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
    sas_ha->notify_port_event(sas_phy, PORTE_TIMER_EVENT);
    break;
    default:
    - ASD_DPRINTK("%s: phy%d: unknown event:0x%x\n", __FUNCTION__,
    + ASD_DPRINTK("%s: phy%d: unknown event:0x%x\n", __func__,
    phy_id, sb_opcode);
    ASD_DPRINTK("edb is 0x%x! dl->opcode is 0x%x\n",
    edb, dl->opcode);
    @@ -654,7 +654,7 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb,

    if (status != 0) {
    ASD_DPRINTK("%s: phy%d status block opcode:0x%x\n",
    - __FUNCTION__, phy_id, status);
    + __func__, phy_id, status);
    goto out;
    }

    @@ -663,7 +663,7 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb,
    asd_ha->hw_prof.enabled_phys &= ~(1 << phy_id);
    asd_turn_led(asd_ha, phy_id, 0);
    asd_control_led(asd_ha, phy_id, 0);
    - ASD_DPRINTK("%s: disable phy%d\n", __FUNCTION__, phy_id);
    + ASD_DPRINTK("%s: disable phy%d\n", __func__, phy_id);
    break;

    case ENABLE_PHY:
    @@ -673,40 +673,40 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb,
    get_lrate_mode(phy, oob_mode);
    asd_turn_led(asd_ha, phy_id, 1);
    ASD_DPRINTK("%s: phy%d, lrate:0x%x, proto:0x%x\n",
    - __FUNCTION__, phy_id,phy->sas_phy.linkrate,
    + __func__, phy_id, phy->sas_phy.linkrate,
    phy->sas_phy.iproto);
    } else if (oob_status & CURRENT_SPINUP_HOLD) {
    asd_ha->hw_prof.enabled_phys |= (1 << phy_id);
    asd_turn_led(asd_ha, phy_id, 1);
    - ASD_DPRINTK("%s: phy%d, spinup hold\n", __FUNCTION__,
    + ASD_DPRINTK("%s: phy%d, spinup hold\n", __func__,
    phy_id);
    } else if (oob_status & CURRENT_ERR_MASK) {
    asd_turn_led(asd_ha, phy_id, 0);
    ASD_DPRINTK("%s: phy%d: error: oob status:0x%02x\n",
    - __FUNCTION__, phy_id, oob_status);
    + __func__, phy_id, oob_status);
    } else if (oob_status & (CURRENT_HOT_PLUG_CNCT
    | CURRENT_DEVICE_PRESENT)) {
    asd_ha->hw_prof.enabled_phys |= (1 << phy_id);
    asd_turn_led(asd_ha, phy_id, 1);
    ASD_DPRINTK("%s: phy%d: hot plug or device present\n",
    - __FUNCTION__, phy_id);
    + __func__, phy_id);
    } else {
    asd_ha->hw_prof.enabled_phys |= (1 << phy_id);
    asd_turn_led(asd_ha, phy_id, 0);
    ASD_DPRINTK("%s: phy%d: no device present: "
    "oob_status:0x%x\n",
    - __FUNCTION__, phy_id, oob_status);
    + __func__, phy_id, oob_status);
    }
    break;
    case RELEASE_SPINUP_HOLD:
    case PHY_NO_OP:
    case EXECUTE_HARD_RESET:
    - ASD_DPRINTK("%s: phy%d: sub_func:0x%x\n", __FUNCTION__,
    + ASD_DPRINTK("%s: phy%d: sub_func:0x%x\n", __func__,
    phy_id, control_phy->sub_func);
    /* XXX finish */
    break;
    default:
    - ASD_DPRINTK("%s: phy%d: sub_func:0x%x?\n", __FUNCTION__,
    + ASD_DPRINTK("%s: phy%d: sub_func:0x%x?\n", __func__,
    phy_id, control_phy->sub_func);
    break;
    }
    diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
    index 326765c..75d20f7 100644
    --- a/drivers/scsi/aic94xx/aic94xx_task.c
    +++ b/drivers/scsi/aic94xx/aic94xx_task.c
    @@ -320,7 +320,7 @@ Again:
    case TC_RESUME:
    case TC_PARTIAL_SG_LIST:
    default:
    - ASD_DPRINTK("%s: dl opcode: 0x%x?\n", __FUNCTION__, opcode);
    + ASD_DPRINTK("%s: dl opcode: 0x%x?\n", __func__, opcode);
    break;
    }

    diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c
    index 633ff40..d4640ef 100644
    --- a/drivers/scsi/aic94xx/aic94xx_tmf.c
    +++ b/drivers/scsi/aic94xx/aic94xx_tmf.c
    @@ -75,12 +75,12 @@ static void asd_clear_nexus_tasklet_complete(struct asd_ascb *ascb,
    struct done_list_struct *dl)
    {
    struct tasklet_completion_status *tcs = ascb->uldd_task;
    - ASD_DPRINTK("%s: here\n", __FUNCTION__);
    + ASD_DPRINTK("%s: here\n", __func__);
    if (!del_timer(&ascb->timer)) {
    - ASD_DPRINTK("%s: couldn't delete timer\n", __FUNCTION__);
    + ASD_DPRINTK("%s: couldn't delete timer\n", __func__);
    return;
    }
    - ASD_DPRINTK("%s: opcode: 0x%x\n", __FUNCTION__, dl->opcode);
    + ASD_DPRINTK("%s: opcode: 0x%x\n", __func__, dl->opcode);
    tcs->dl_opcode = dl->opcode;
    complete(ascb->completion);
    asd_ascb_free(ascb);
    @@ -91,7 +91,7 @@ static void asd_clear_nexus_timedout(unsigned long data)
    struct asd_ascb *ascb = (void *)data;
    struct tasklet_completion_status *tcs = ascb->uldd_task;

    - ASD_DPRINTK("%s: here\n", __FUNCTION__);
    + ASD_DPRINTK("%s: here\n", __func__);
    tcs->dl_opcode = TMF_RESP_FUNC_FAILED;
    complete(ascb->completion);
    }
    @@ -103,7 +103,7 @@ static void asd_clear_nexus_timedout(unsigned long data)
    DECLARE_COMPLETION_ONSTACK(completion); \
    DECLARE_TCS(tcs); \
    \
    - ASD_DPRINTK("%s: PRE\n", __FUNCTION__); \
    + ASD_DPRINTK("%s: PRE\n", __func__); \
    res = 1; \
    ascb = asd_ascb_alloc_list(asd_ha, &res, GFP_KERNEL); \
    if (!ascb) \
    @@ -115,12 +115,12 @@ static void asd_clear_nexus_timedout(unsigned long data)
    scb->header.opcode = CLEAR_NEXUS

    #define CLEAR_NEXUS_POST \
    - ASD_DPRINTK("%s: POST\n", __FUNCTION__); \
    + ASD_DPRINTK("%s: POST\n", __func__); \
    res = asd_enqueue_internal(ascb, asd_clear_nexus_tasklet_complete, \
    asd_clear_nexus_timedout); \
    if (res) \
    goto out_err; \
    - ASD_DPRINTK("%s: clear nexus posted, waiting...\n", __FUNCTION__); \
    + ASD_DPRINTK("%s: clear nexus posted, waiting...\n", __func__); \
    wait_for_completion(&completion); \
    res = tcs.dl_opcode; \
    if (res == TC_NO_ERROR) \
    @@ -417,7 +417,7 @@ int asd_abort_task(struct sas_task *task)
    if (task->task_state_flags & SAS_TASK_STATE_DONE) {
    spin_unlock_irqrestore(&task->task_state_lock, flags);
    res = TMF_RESP_FUNC_COMPLETE;
    - ASD_DPRINTK("%s: task 0x%p done\n", __FUNCTION__, task);
    + ASD_DPRINTK("%s: task 0x%p done\n", __func__, task);
    goto out_done;
    }
    spin_unlock_irqrestore(&task->task_state_lock, flags);
    @@ -481,7 +481,7 @@ int asd_abort_task(struct sas_task *task)
    if (task->task_state_flags & SAS_TASK_STATE_DONE) {
    spin_unlock_irqrestore(&task->task_state_lock, flags);
    res = TMF_RESP_FUNC_COMPLETE;
    - ASD_DPRINTK("%s: task 0x%p done\n", __FUNCTION__, task);
    + ASD_DPRINTK("%s: task 0x%p done\n", __func__, task);
    goto out_done;
    }
    spin_unlock_irqrestore(&task->task_state_lock, flags);
    --
    1.5.6.3

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. [PATCH 3/5] drivers/scsi/libsas/: replace __FUNCTION__ with __func__

    Signed-off-by: Denis ChengRq
    ---
    drivers/scsi/libsas/sas_ata.c | 16 ++++++++--------
    drivers/scsi/libsas/sas_expander.c | 13 +++++++------
    drivers/scsi/libsas/sas_port.c | 4 ++--
    drivers/scsi/libsas/sas_scsi_host.c | 30 +++++++++++++++---------------
    4 files changed, 32 insertions(+), 31 deletions(-)

    diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
    index 744f06d..48ee8c7 100644
    --- a/drivers/scsi/libsas/sas_ata.c
    +++ b/drivers/scsi/libsas/sas_ata.c
    @@ -74,7 +74,7 @@ static enum ata_completion_errors sas_to_ata_err(struct task_status_struct *ts)
    case SAS_OPEN_TO:
    case SAS_OPEN_REJECT:
    SAS_DPRINTK("%s: Saw error %d. What to do?\n",
    - __FUNCTION__, ts->stat);
    + __func__, ts->stat);
    return AC_ERR_OTHER;

    case SAS_ABORTED_TASK:
    @@ -115,7 +115,7 @@ static void sas_ata_task_done(struct sas_task *task)
    } else if (stat->stat != SAM_STAT_GOOD) {
    ac = sas_to_ata_err(stat);
    if (ac) {
    - SAS_DPRINTK("%s: SAS error %x\n", __FUNCTION__,
    + SAS_DPRINTK("%s: SAS error %x\n", __func__,
    stat->stat);
    /* We saw a SAS error. Send a vague error. */
    qc->err_mask = ac;
    @@ -244,20 +244,20 @@ static void sas_ata_phy_reset(struct ata_port *ap)
    res = i->dft->lldd_I_T_nexus_reset(dev);

    if (res != TMF_RESP_FUNC_COMPLETE)
    - SAS_DPRINTK("%s: Unable to reset I T nexus?\n", __FUNCTION__);
    + SAS_DPRINTK("%s: Unable to reset I T nexus?\n", __func__);

    switch (dev->sata_dev.command_set) {
    case ATA_COMMAND_SET:
    - SAS_DPRINTK("%s: Found ATA device.\n", __FUNCTION__);
    + SAS_DPRINTK("%s: Found ATA device.\n", __func__);
    ap->link.device[0].class = ATA_DEV_ATA;
    break;
    case ATAPI_COMMAND_SET:
    - SAS_DPRINTK("%s: Found ATAPI device.\n", __FUNCTION__);
    + SAS_DPRINTK("%s: Found ATAPI device.\n", __func__);
    ap->link.device[0].class = ATA_DEV_ATAPI;
    break;
    default:
    SAS_DPRINTK("%s: Unknown SATA command set: %d.\n",
    - __FUNCTION__,
    + __func__,
    dev->sata_dev.command_set);
    ap->link.device[0].class = ATA_DEV_UNKNOWN;
    break;
    @@ -299,7 +299,7 @@ static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
    {
    struct domain_device *dev = ap->private_data;

    - SAS_DPRINTK("STUB %s\n", __FUNCTION__);
    + SAS_DPRINTK("STUB %s\n", __func__);
    switch (sc_reg_in) {
    case SCR_STATUS:
    dev->sata_dev.sstatus = val;
    @@ -324,7 +324,7 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
    {
    struct domain_device *dev = ap->private_data;

    - SAS_DPRINTK("STUB %s\n", __FUNCTION__);
    + SAS_DPRINTK("STUB %s\n", __func__);
    switch (sc_reg_in) {
    case SCR_STATUS:
    *val = dev->sata_dev.sstatus;
    diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
    index aefd865..996a581 100644
    --- a/drivers/scsi/libsas/sas_expander.c
    +++ b/drivers/scsi/libsas/sas_expander.c
    @@ -121,7 +121,7 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size,
    break;
    } else {
    SAS_DPRINTK("%s: task to dev %016llx response: 0x%x "
    - "status 0x%x\n", __FUNCTION__,
    + "status 0x%x\n", __func__,
    SAS_ADDR(dev->sas_addr),
    task->task_status.resp,
    task->task_status.stat);
    @@ -1279,7 +1279,7 @@ static int sas_configure_present(struct domain_device *dev, int phy_id,
    goto out;
    } else if (res != SMP_RESP_FUNC_ACC) {
    SAS_DPRINTK("%s: dev %016llx phy 0x%x index 0x%x "
    - "result 0x%x\n", __FUNCTION__,
    + "result 0x%x\n", __func__,
    SAS_ADDR(dev->sas_addr), phy_id, i, res);
    goto out;
    }
    @@ -1901,7 +1901,7 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,

    if (!rsp) {
    printk("%s: space for a smp response is missing\n",
    - __FUNCTION__);
    + __func__);
    return -EINVAL;
    }

    @@ -1914,20 +1914,21 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
    if (type != SAS_EDGE_EXPANDER_DEVICE &&
    type != SAS_FANOUT_EXPANDER_DEVICE) {
    printk("%s: can we send a smp request to a device?\n",
    - __FUNCTION__);
    + __func__);
    return -EINVAL;
    }

    dev = sas_find_dev_by_rphy(rphy);
    if (!dev) {
    - printk("%s: fail to find a domain_device?\n", __FUNCTION__);
    + printk(KERN_ERR "%s: fail to find a domain_device?\n",
    + __func__);
    return -EINVAL;
    }

    /* do we need to support multiple segments? */
    if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) {
    printk("%s: multiple segments req %u %u, rsp %u %u\n",
    - __FUNCTION__, req->bio->bi_vcnt, req->data_len,
    + __func__, req->bio->bi_vcnt, req->data_len,
    rsp->bio->bi_vcnt, rsp->data_len);
    return -EINVAL;
    }
    diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
    index 39ae68a..139935a 100644
    --- a/drivers/scsi/libsas/sas_port.c
    +++ b/drivers/scsi/libsas/sas_port.c
    @@ -50,7 +50,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
    sas_deform_port(phy);
    else {
    SAS_DPRINTK("%s: phy%d belongs to port%d already(%d)!\n",
    - __FUNCTION__, phy->id, phy->port->id,
    + __func__, phy->id, phy->port->id,
    phy->port->num_phys);
    return;
    }
    @@ -78,7 +78,7 @@ static void sas_form_port(struct asd_sas_phy *phy)

    if (i >= sas_ha->num_phys) {
    printk(KERN_NOTICE "%s: couldn't find a free port, bug?\n",
    - __FUNCTION__);
    + __func__);
    spin_unlock_irqrestore(&sas_ha->phy_port_lock, flags);
    return;
    }
    diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
    index 601ec5b..87dfb60 100644
    --- a/drivers/scsi/libsas/sas_scsi_host.c
    +++ b/drivers/scsi/libsas/sas_scsi_host.c
    @@ -343,7 +343,7 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task)
    flags);
    SAS_DPRINTK("%s: task 0x%p aborted from "
    "task_queue\n",
    - __FUNCTION__, task);
    + __func__, task);
    return TASK_IS_ABORTED;
    }
    }
    @@ -351,13 +351,13 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task)
    }

    for (i = 0; i < 5; i++) {
    - SAS_DPRINTK("%s: aborting task 0x%p\n", __FUNCTION__, task);
    + SAS_DPRINTK("%s: aborting task 0x%p\n", __func__, task);
    res = si->dft->lldd_abort_task(task);

    spin_lock_irqsave(&task->task_state_lock, flags);
    if (task->task_state_flags & SAS_TASK_STATE_DONE) {
    spin_unlock_irqrestore(&task->task_state_lock, flags);
    - SAS_DPRINTK("%s: task 0x%p is done\n", __FUNCTION__,
    + SAS_DPRINTK("%s: task 0x%p is done\n", __func__,
    task);
    return TASK_IS_DONE;
    }
    @@ -365,24 +365,24 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task)

    if (res == TMF_RESP_FUNC_COMPLETE) {
    SAS_DPRINTK("%s: task 0x%p is aborted\n",
    - __FUNCTION__, task);
    + __func__, task);
    return TASK_IS_ABORTED;
    } else if (si->dft->lldd_query_task) {
    SAS_DPRINTK("%s: querying task 0x%p\n",
    - __FUNCTION__, task);
    + __func__, task);
    res = si->dft->lldd_query_task(task);
    switch (res) {
    case TMF_RESP_FUNC_SUCC:
    SAS_DPRINTK("%s: task 0x%p at LU\n",
    - __FUNCTION__, task);
    + __func__, task);
    return TASK_IS_AT_LU;
    case TMF_RESP_FUNC_COMPLETE:
    SAS_DPRINTK("%s: task 0x%p not at LU\n",
    - __FUNCTION__, task);
    + __func__, task);
    return TASK_IS_NOT_AT_LU;
    case TMF_RESP_FUNC_FAILED:
    SAS_DPRINTK("%s: task 0x%p failed to abort\n",
    - __FUNCTION__, task);
    + __func__, task);
    return TASK_ABORT_FAILED;
    }

    @@ -545,7 +545,7 @@ Again:

    if (need_reset) {
    SAS_DPRINTK("%s: task 0x%p requests reset\n",
    - __FUNCTION__, task);
    + __func__, task);
    goto reset;
    }

    @@ -556,13 +556,13 @@ Again:

    switch (res) {
    case TASK_IS_DONE:
    - SAS_DPRINTK("%s: task 0x%p is done\n", __FUNCTION__,
    + SAS_DPRINTK("%s: task 0x%p is done\n", __func__,
    task);
    sas_eh_finish_cmd(cmd);
    continue;
    case TASK_IS_ABORTED:
    SAS_DPRINTK("%s: task 0x%p is aborted\n",
    - __FUNCTION__, task);
    + __func__, task);
    sas_eh_finish_cmd(cmd);
    continue;
    case TASK_IS_AT_LU:
    @@ -633,7 +633,7 @@ Again:
    }
    return list_empty(work_q);
    clear_q:
    - SAS_DPRINTK("--- Exit %s -- clear_q\n", __FUNCTION__);
    + SAS_DPRINTK("--- Exit %s -- clear_q\n", __func__);
    list_for_each_entry_safe(cmd, n, work_q, eh_entry)
    sas_eh_finish_cmd(cmd);

    @@ -650,7 +650,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)
    list_splice_init(&shost->eh_cmd_q, &eh_work_q);
    spin_unlock_irqrestore(shost->host_lock, flags);

    - SAS_DPRINTK("Enter %s\n", __FUNCTION__);
    + SAS_DPRINTK("Enter %s\n", __func__);
    /*
    * Deal with commands that still have SAS tasks (i.e. they didn't
    * complete via the normal sas_task completion mechanism)
    @@ -669,7 +669,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)

    out:
    scsi_eh_flush_done_q(&ha->eh_done_q);
    - SAS_DPRINTK("--- Exit %s\n", __FUNCTION__);
    + SAS_DPRINTK("--- Exit %s\n", __func__);
    return;
    }

    @@ -990,7 +990,7 @@ int __sas_task_abort(struct sas_task *task)
    if (task->task_state_flags & SAS_TASK_STATE_ABORTED ||
    task->task_state_flags & SAS_TASK_STATE_DONE) {
    spin_unlock_irqrestore(&task->task_state_lock, flags);
    - SAS_DPRINTK("%s: Task %p already finished.\n", __FUNCTION__,
    + SAS_DPRINTK("%s: Task %p already finished.\n", __func__,
    task);
    return 0;
    }
    --
    1.5.6.3

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread