redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[SCSI] replace __FUNCTION__ with __func__ 

[jejb: fixed up a ton of missed conversions.

 All of you are on notice this has happened, driver trees will now
 need to be rebased]

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: SCSI List <linux-scsi@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
hifive-unleashed-5.1
Harvey Harrison 2008-07-03 23:47:27 -07:00 committed by James Bottomley
parent 2b14290078
commit cadbd4a5e3
49 changed files with 235 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/message/fusion/mptbase.c
View File

@ -273,12 +273,12 @@ mpt_fault_reset_work(struct work_struct *work)
ioc_raw_state = mpt_GetIocState(ioc, 0); ioc_raw_state = mpt_GetIocState(ioc, 0);
if ((ioc_raw_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_FAULT) { if ((ioc_raw_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_FAULT) {
printk(MYIOC_s_WARN_FMT "IOC is in FAULT state (%04xh)!!!\n", printk(MYIOC_s_WARN_FMT "IOC is in FAULT state (%04xh)!!!\n",
ioc->name, ioc_raw_state & MPI_DOORBELL_DATA_MASK); ioc->name, ioc_raw_state & MPI_DOORBELL_DATA_MASK);
printk(MYIOC_s_WARN_FMT "Issuing HardReset from %s!!\n", printk(MYIOC_s_WARN_FMT "Issuing HardReset from %s!!\n",
ioc->name, __FUNCTION__); ioc->name, __func__);
rc = mpt_HardResetHandler(ioc, CAN_SLEEP); rc = mpt_HardResetHandler(ioc, CAN_SLEEP);
printk(MYIOC_s_WARN_FMT "%s: HardReset: %s\n", ioc->name, printk(MYIOC_s_WARN_FMT "%s: HardReset: %s\n", ioc->name,
__FUNCTION__, (rc == 0) ? "success" : "failed"); __func__, (rc == 0) ? "success" : "failed");
ioc_raw_state = mpt_GetIocState(ioc, 0); ioc_raw_state = mpt_GetIocState(ioc, 0);
if ((ioc_raw_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_FAULT) if ((ioc_raw_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_FAULT)
printk(MYIOC_s_WARN_FMT "IOC is in FAULT state after " printk(MYIOC_s_WARN_FMT "IOC is in FAULT state after "
@ -356,7 +356,7 @@ mpt_turbo_reply(MPT_ADAPTER *ioc, u32 pa)
if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS || if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS ||
MptCallbacks[cb_idx] == NULL) { MptCallbacks[cb_idx] == NULL) {
printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n", printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n",
__FUNCTION__, ioc->name, cb_idx); __func__, ioc->name, cb_idx);
goto out; goto out;
} }
@ -420,7 +420,7 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa)
if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS || if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS ||
MptCallbacks[cb_idx] == NULL) { MptCallbacks[cb_idx] == NULL) {
printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n", printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n",
__FUNCTION__, ioc->name, cb_idx); __func__, ioc->name, cb_idx);
freeme = 0; freeme = 0;
goto out; goto out;
} }
@ -2434,7 +2434,7 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
if (ioc->cached_fw != NULL) { if (ioc->cached_fw != NULL) {
ddlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: Pushing FW onto " ddlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: Pushing FW onto "
"adapter\n", __FUNCTION__, ioc->name)); "adapter\n", __func__, ioc->name));
if ((ret = mpt_downloadboot(ioc, (MpiFwHeader_t *) if ((ret = mpt_downloadboot(ioc, (MpiFwHeader_t *)
ioc->cached_fw, CAN_SLEEP)) < 0) { ioc->cached_fw, CAN_SLEEP)) < 0) {
printk(MYIOC_s_WARN_FMT printk(MYIOC_s_WARN_FMT
@ -3693,7 +3693,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)
if (ioc->pcidev->device == MPI_MANUFACTPAGE_DEVID_SAS1078) { if (ioc->pcidev->device == MPI_MANUFACTPAGE_DEVID_SAS1078) {
drsprintk(ioc, printk(MYIOC_s_WARN_FMT "%s: Doorbell=%p; 1078 reset " drsprintk(ioc, printk(MYIOC_s_WARN_FMT "%s: Doorbell=%p; 1078 reset "
"address=%p\n", ioc->name, __FUNCTION__, "address=%p\n", ioc->name, __func__,
&ioc->chip->Doorbell, &ioc->chip->Reset_1078)); &ioc->chip->Doorbell, &ioc->chip->Reset_1078));
CHIPREG_WRITE32(&ioc->chip->Reset_1078, 0x07); CHIPREG_WRITE32(&ioc->chip->Reset_1078, 0x07);
if (sleepFlag == CAN_SLEEP) if (sleepFlag == CAN_SLEEP)
@ -4742,12 +4742,12 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode)
break; break;
} }
printk("%s: persist_opcode=%x\n",__FUNCTION__, persist_opcode); printk("%s: persist_opcode=%x\n",__func__, persist_opcode);
/* Get a MF for this command. /* Get a MF for this command.
*/ */
if ((mf = mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) { if ((mf = mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {
printk("%s: no msg frames!\n",__FUNCTION__); printk("%s: no msg frames!\n",__func__);
return -1; return -1;
} }
@ -4771,13 +4771,13 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode)
(SasIoUnitControlReply_t *)ioc->persist_reply_frame; (SasIoUnitControlReply_t *)ioc->persist_reply_frame;
if (le16_to_cpu(sasIoUnitCntrReply->IOCStatus) != MPI_IOCSTATUS_SUCCESS) { if (le16_to_cpu(sasIoUnitCntrReply->IOCStatus) != MPI_IOCSTATUS_SUCCESS) {
printk("%s: IOCStatus=0x%X IOCLogInfo=0x%X\n", printk("%s: IOCStatus=0x%X IOCLogInfo=0x%X\n",
__FUNCTION__, __func__,
sasIoUnitCntrReply->IOCStatus, sasIoUnitCntrReply->IOCStatus,
sasIoUnitCntrReply->IOCLogInfo); sasIoUnitCntrReply->IOCLogInfo);
return -1; return -1;
} }
printk("%s: success\n",__FUNCTION__); printk("%s: success\n",__func__);
return 0; return 0;
} }
@ -5784,7 +5784,7 @@ SendEventAck(MPT_ADAPTER *ioc, EventNotificationReply_t *evnp)
if ((pAck = (EventAck_t *) mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) { if ((pAck = (EventAck_t *) mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {
dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames!!\n", dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames!!\n",
ioc->name,__FUNCTION__)); ioc->name,__func__));
return -1; return -1;
} }

4
drivers/message/fusion/mptctl.c
View File

@ -505,7 +505,7 @@ mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
event = le32_to_cpu(pEvReply->Event) & 0xFF; event = le32_to_cpu(pEvReply->Event) & 0xFF;
dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s() called\n", dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s() called\n",
ioc->name, __FUNCTION__)); ioc->name, __func__));
if(async_queue == NULL) if(async_queue == NULL)
return 1; return 1;
@ -2482,7 +2482,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
*/ */
if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) { if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) {
dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames!!\n", dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames!!\n",
ioc->name,__FUNCTION__)); ioc->name,__func__));
goto out; goto out;
} }

8
drivers/message/fusion/mptfc.c
View File

@ -231,28 +231,28 @@ static int
mptfc_abort(struct scsi_cmnd *SCpnt) mptfc_abort(struct scsi_cmnd *SCpnt)
{ {
return return
mptfc_block_error_handler(SCpnt, mptscsih_abort, __FUNCTION__); mptfc_block_error_handler(SCpnt, mptscsih_abort, __func__);
} }
static int static int
mptfc_dev_reset(struct scsi_cmnd *SCpnt) mptfc_dev_reset(struct scsi_cmnd *SCpnt)
{ {
return return
mptfc_block_error_handler(SCpnt, mptscsih_dev_reset, __FUNCTION__); mptfc_block_error_handler(SCpnt, mptscsih_dev_reset, __func__);
} }
static int static int
mptfc_bus_reset(struct scsi_cmnd *SCpnt) mptfc_bus_reset(struct scsi_cmnd *SCpnt)
{ {
return return
mptfc_block_error_handler(SCpnt, mptscsih_bus_reset, __FUNCTION__); mptfc_block_error_handler(SCpnt, mptscsih_bus_reset, __func__);
} }
static int static int
mptfc_host_reset(struct scsi_cmnd *SCpnt) mptfc_host_reset(struct scsi_cmnd *SCpnt)
{ {
return return
mptfc_block_error_handler(SCpnt, mptscsih_host_reset, __FUNCTION__); mptfc_block_error_handler(SCpnt, mptscsih_host_reset, __func__);
} }
static void static void

26
drivers/message/fusion/mptlan.c
View File

@ -610,7 +610,7 @@ mpt_lan_send_turbo(struct net_device *dev, u32 tmsg)
dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n", dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n",
IOC_AND_NETDEV_NAMES_s_s(dev), IOC_AND_NETDEV_NAMES_s_s(dev),
__FUNCTION__, sent)); __func__, sent));
priv->SendCtl[ctx].skb = NULL; priv->SendCtl[ctx].skb = NULL;
pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma, pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma,
@ -676,7 +676,7 @@ mpt_lan_send_reply(struct net_device *dev, LANSendReply_t *pSendRep)
dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n", dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n",
IOC_AND_NETDEV_NAMES_s_s(dev), IOC_AND_NETDEV_NAMES_s_s(dev),
__FUNCTION__, sent)); __func__, sent));
priv->SendCtl[ctx].skb = NULL; priv->SendCtl[ctx].skb = NULL;
pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma, pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma,
@ -715,7 +715,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
u16 cur_naa = 0x1000; u16 cur_naa = 0x1000;
dioprintk((KERN_INFO MYNAM ": %s called, skb_addr = %p\n", dioprintk((KERN_INFO MYNAM ": %s called, skb_addr = %p\n",
__FUNCTION__, skb)); __func__, skb));
spin_lock_irqsave(&priv->txfidx_lock, flags); spin_lock_irqsave(&priv->txfidx_lock, flags);
if (priv->mpt_txfidx_tail < 0) { if (priv->mpt_txfidx_tail < 0) {
@ -723,7 +723,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
spin_unlock_irqrestore(&priv->txfidx_lock, flags); spin_unlock_irqrestore(&priv->txfidx_lock, flags);
printk (KERN_ERR "%s: no tx context available: %u\n", printk (KERN_ERR "%s: no tx context available: %u\n",
__FUNCTION__, priv->mpt_txfidx_tail); __func__, priv->mpt_txfidx_tail);
return 1; return 1;
} }
@ -733,7 +733,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
spin_unlock_irqrestore(&priv->txfidx_lock, flags); spin_unlock_irqrestore(&priv->txfidx_lock, flags);
printk (KERN_ERR "%s: Unable to alloc request frame\n", printk (KERN_ERR "%s: Unable to alloc request frame\n",
__FUNCTION__); __func__);
return 1; return 1;
} }
@ -1208,7 +1208,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, Start_buckets = %u, buckets_out = %u\n", dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, Start_buckets = %u, buckets_out = %u\n",
IOC_AND_NETDEV_NAMES_s_s(dev), IOC_AND_NETDEV_NAMES_s_s(dev),
__FUNCTION__, buckets, curr)); __func__, buckets, curr));
max = (mpt_dev->req_sz - MPT_LAN_RECEIVE_POST_REQUEST_SIZE) / max = (mpt_dev->req_sz - MPT_LAN_RECEIVE_POST_REQUEST_SIZE) /
(MPT_LAN_TRANSACTION32_SIZE + sizeof(SGESimple64_t)); (MPT_LAN_TRANSACTION32_SIZE + sizeof(SGESimple64_t));
@ -1217,9 +1217,9 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
mf = mpt_get_msg_frame(LanCtx, mpt_dev); mf = mpt_get_msg_frame(LanCtx, mpt_dev);
if (mf == NULL) { if (mf == NULL) {
printk (KERN_ERR "%s: Unable to alloc request frame\n", printk (KERN_ERR "%s: Unable to alloc request frame\n",
__FUNCTION__); __func__);
dioprintk((KERN_ERR "%s: %u buckets remaining\n", dioprintk((KERN_ERR "%s: %u buckets remaining\n",
__FUNCTION__, buckets)); __func__, buckets));
goto out; goto out;
} }
pRecvReq = (LANReceivePostRequest_t *) mf; pRecvReq = (LANReceivePostRequest_t *) mf;
@ -1244,7 +1244,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
spin_lock_irqsave(&priv->rxfidx_lock, flags); spin_lock_irqsave(&priv->rxfidx_lock, flags);
if (priv->mpt_rxfidx_tail < 0) { if (priv->mpt_rxfidx_tail < 0) {
printk (KERN_ERR "%s: Can't alloc context\n", printk (KERN_ERR "%s: Can't alloc context\n",
__FUNCTION__); __func__);
spin_unlock_irqrestore(&priv->rxfidx_lock, spin_unlock_irqrestore(&priv->rxfidx_lock,
flags); flags);
break; break;
@ -1267,7 +1267,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
if (skb == NULL) { if (skb == NULL) {
printk (KERN_WARNING printk (KERN_WARNING
MYNAM "/%s: Can't alloc skb\n", MYNAM "/%s: Can't alloc skb\n",
__FUNCTION__); __func__);
priv->mpt_rxfidx[++priv->mpt_rxfidx_tail] = ctx; priv->mpt_rxfidx[++priv->mpt_rxfidx_tail] = ctx;
spin_unlock_irqrestore(&priv->rxfidx_lock, flags); spin_unlock_irqrestore(&priv->rxfidx_lock, flags);
break; break;
@ -1305,7 +1305,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
if (pSimple == NULL) { if (pSimple == NULL) {
/**/ printk (KERN_WARNING MYNAM "/%s: No buckets posted\n", /**/ printk (KERN_WARNING MYNAM "/%s: No buckets posted\n",
/**/ __FUNCTION__); /**/ __func__);
mpt_free_msg_frame(mpt_dev, mf); mpt_free_msg_frame(mpt_dev, mf);
goto out; goto out;
} }
@ -1329,9 +1329,9 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
out: out:
dioprintk((KERN_INFO MYNAM "/%s: End_buckets = %u, priv->buckets_out = %u\n", dioprintk((KERN_INFO MYNAM "/%s: End_buckets = %u, priv->buckets_out = %u\n",
__FUNCTION__, buckets, atomic_read(&priv->buckets_out))); __func__, buckets, atomic_read(&priv->buckets_out)));
dioprintk((KERN_INFO MYNAM "/%s: Posted %u buckets and received %u back\n", dioprintk((KERN_INFO MYNAM "/%s: Posted %u buckets and received %u back\n",
__FUNCTION__, priv->total_posted, priv->total_received)); __func__, priv->total_posted, priv->total_received));
clear_bit(0, &priv->post_buckets_active); clear_bit(0, &priv->post_buckets_active);
} }

54
drivers/message/fusion/mptsas.c
View File

@ -300,7 +300,7 @@ mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_detai
phy_info = port_info->phy_info; phy_info = port_info->phy_info;
dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: [%p]: num_phys=%02d " dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: [%p]: num_phys=%02d "
"bitmask=0x%016llX\n", ioc->name, __FUNCTION__, port_details, "bitmask=0x%016llX\n", ioc->name, __func__, port_details,
port_details->num_phys, (unsigned long long) port_details->num_phys, (unsigned long long)
port_details->phy_bitmask)); port_details->phy_bitmask));
@ -411,7 +411,7 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
*/ */
dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT
"%s: [%p]: deleting phy = %d\n", "%s: [%p]: deleting phy = %d\n",
ioc->name, __FUNCTION__, port_details, i)); ioc->name, __func__, port_details, i));
port_details->num_phys--; port_details->num_phys--;
port_details->phy_bitmask &= ~ (1 << phy_info->phy_id); port_details->phy_bitmask &= ~ (1 << phy_info->phy_id);
memset(&phy_info->attached, 0, sizeof(struct mptsas_devinfo)); memset(&phy_info->attached, 0, sizeof(struct mptsas_devinfo));
@ -497,7 +497,7 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
continue; continue;
dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT
"%s: [%p]: phy_id=%02d num_phys=%02d " "%s: [%p]: phy_id=%02d num_phys=%02d "
"bitmask=0x%016llX\n", ioc->name, __FUNCTION__, "bitmask=0x%016llX\n", ioc->name, __func__,
port_details, i, port_details->num_phys, port_details, i, port_details->num_phys,
(unsigned long long)port_details->phy_bitmask)); (unsigned long long)port_details->phy_bitmask));
dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "\t\tport = %p rphy=%p\n", dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "\t\tport = %p rphy=%p\n",
@ -553,7 +553,7 @@ mptsas_target_reset(MPT_ADAPTER *ioc, u8 channel, u8 id)
if ((mf = mpt_get_msg_frame(ioc->TaskCtx, ioc)) == NULL) { if ((mf = mpt_get_msg_frame(ioc->TaskCtx, ioc)) == NULL) {
dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames @%d!!\n", dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames @%d!!\n",
ioc->name,__FUNCTION__, __LINE__)); ioc->name,__func__, __LINE__));
return 0; return 0;
} }
@ -606,7 +606,7 @@ mptsas_target_reset_queue(MPT_ADAPTER *ioc,
GFP_ATOMIC); GFP_ATOMIC);
if (!target_reset_list) { if (!target_reset_list) {
dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, failed to allocate mem @%d..!!\n", dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, failed to allocate mem @%d..!!\n",
ioc->name,__FUNCTION__, __LINE__)); ioc->name,__func__, __LINE__));
return; return;
} }
@ -673,7 +673,7 @@ mptsas_dev_reset_complete(MPT_ADAPTER *ioc)
ev = kzalloc(sizeof(*ev), GFP_ATOMIC); ev = kzalloc(sizeof(*ev), GFP_ATOMIC);
if (!ev) { if (!ev) {
dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, failed to allocate mem @%d..!!\n", dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, failed to allocate mem @%d..!!\n",
ioc->name,__FUNCTION__, __LINE__)); ioc->name,__func__, __LINE__));
return; return;
} }
@ -1183,7 +1183,7 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset)
reply = (SasIoUnitControlReply_t *)ioc->sas_mgmt.reply; reply = (SasIoUnitControlReply_t *)ioc->sas_mgmt.reply;
if (reply->IOCStatus != MPI_IOCSTATUS_SUCCESS) { if (reply->IOCStatus != MPI_IOCSTATUS_SUCCESS) {
printk(MYIOC_s_INFO_FMT "%s: IOCStatus=0x%X IOCLogInfo=0x%X\n", printk(MYIOC_s_INFO_FMT "%s: IOCStatus=0x%X IOCLogInfo=0x%X\n",
ioc->name, __FUNCTION__, reply->IOCStatus, reply->IOCLogInfo); ioc->name, __func__, reply->IOCStatus, reply->IOCLogInfo);
error = -ENXIO; error = -ENXIO;
goto out_unlock; goto out_unlock;
} }
@ -1270,14 +1270,14 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
if (!rsp) { if (!rsp) {
printk(MYIOC_s_ERR_FMT "%s: the smp response space is missing\n", printk(MYIOC_s_ERR_FMT "%s: the smp response space is missing\n",
ioc->name, __FUNCTION__); ioc->name, __func__);
return -EINVAL; return -EINVAL;
} }
/* do we need to support multiple segments? */ /* do we need to support multiple segments? */
if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) { if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) {
printk(MYIOC_s_ERR_FMT "%s: multiple segments req %u %u, rsp %u %u\n", printk(MYIOC_s_ERR_FMT "%s: multiple segments req %u %u, rsp %u %u\n",
ioc->name, __FUNCTION__, req->bio->bi_vcnt, req->data_len, ioc->name, __func__, req->bio->bi_vcnt, req->data_len,
rsp->bio->bi_vcnt, rsp->data_len); rsp->bio->bi_vcnt, rsp->data_len);
return -EINVAL; return -EINVAL;
} }
@ -1343,7 +1343,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
timeleft = wait_for_completion_timeout(&ioc->sas_mgmt.done, 10 * HZ); timeleft = wait_for_completion_timeout(&ioc->sas_mgmt.done, 10 * HZ);
if (!timeleft) { if (!timeleft) {
printk(MYIOC_s_ERR_FMT "%s: smp timeout!\n", ioc->name, __FUNCTION__); printk(MYIOC_s_ERR_FMT "%s: smp timeout!\n", ioc->name, __func__);
/* On timeout reset the board */ /* On timeout reset the board */
mpt_HardResetHandler(ioc, CAN_SLEEP); mpt_HardResetHandler(ioc, CAN_SLEEP);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
@ -1361,7 +1361,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
rsp->data_len -= smprep->ResponseDataLength; rsp->data_len -= smprep->ResponseDataLength;
} else { } else {
printk(MYIOC_s_ERR_FMT "%s: smp passthru reply failed to be returned\n", printk(MYIOC_s_ERR_FMT "%s: smp passthru reply failed to be returned\n",
ioc->name, __FUNCTION__); ioc->name, __func__);
ret = -ENXIO; ret = -ENXIO;
} }
unmap: unmap:
@ -2006,7 +2006,7 @@ static int mptsas_probe_one_phy(struct device *dev,
if (error) { if (error) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
goto out; goto out;
} }
mptsas_set_port(ioc, phy_info, port); mptsas_set_port(ioc, phy_info, port);
@ -2076,7 +2076,7 @@ static int mptsas_probe_one_phy(struct device *dev,
if (!rphy) { if (!rphy) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
goto out; goto out;
} }
@ -2085,7 +2085,7 @@ static int mptsas_probe_one_phy(struct device *dev,
if (error) { if (error) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
sas_rphy_free(rphy); sas_rphy_free(rphy);
goto out; goto out;
} }
@ -2613,7 +2613,7 @@ mptsas_hotplug_work(struct work_struct *work)
(ev->channel << 8) + ev->id)) { (ev->channel << 8) + ev->id)) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
phy_info = mptsas_find_phyinfo_by_sas_address( phy_info = mptsas_find_phyinfo_by_sas_address(
@ -2633,20 +2633,20 @@ mptsas_hotplug_work(struct work_struct *work)
if (!phy_info){ if (!phy_info){
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
if (!phy_info->port_details) { if (!phy_info->port_details) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
rphy = mptsas_get_rphy(phy_info); rphy = mptsas_get_rphy(phy_info);
if (!rphy) { if (!rphy) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
@ -2654,7 +2654,7 @@ mptsas_hotplug_work(struct work_struct *work)
if (!port) { if (!port) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
@ -2665,7 +2665,7 @@ mptsas_hotplug_work(struct work_struct *work)
if (!vtarget) { if (!vtarget) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
@ -2720,7 +2720,7 @@ mptsas_hotplug_work(struct work_struct *work)
(ev->channel << 8) + ev->id)) { (ev->channel << 8) + ev->id)) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
@ -2732,7 +2732,7 @@ mptsas_hotplug_work(struct work_struct *work)
if (!phy_info || !phy_info->port_details) { if (!phy_info || !phy_info->port_details) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
@ -2744,7 +2744,7 @@ mptsas_hotplug_work(struct work_struct *work)
if (!vtarget) { if (!vtarget) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
/* /*
@ -2767,7 +2767,7 @@ mptsas_hotplug_work(struct work_struct *work)
if (mptsas_get_rphy(phy_info)) { if (mptsas_get_rphy(phy_info)) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
if (ev->channel) printk("%d\n", __LINE__); if (ev->channel) printk("%d\n", __LINE__);
break; break;
} }
@ -2776,7 +2776,7 @@ mptsas_hotplug_work(struct work_struct *work)
if (!port) { if (!port) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; break;
} }
memcpy(&phy_info->attached, &sas_device, memcpy(&phy_info->attached, &sas_device,
@ -2801,7 +2801,7 @@ mptsas_hotplug_work(struct work_struct *work)
if (!rphy) { if (!rphy) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
break; /* non-fatal: an rphy can be added later */ break; /* non-fatal: an rphy can be added later */
} }
@ -2809,7 +2809,7 @@ mptsas_hotplug_work(struct work_struct *work)
if (sas_rphy_add(rphy)) { if (sas_rphy_add(rphy)) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name, "%s: exit at line=%d\n", ioc->name,
__FUNCTION__, __LINE__)); __func__, __LINE__));
sas_rphy_free(rphy); sas_rphy_free(rphy);
break; break;
} }

4
drivers/message/fusion/mptscsih.c
View File

@ -461,7 +461,7 @@ mptscsih_issue_sep_command(MPT_ADAPTER *ioc, VirtTarget *vtarget,
if ((mf = mpt_get_msg_frame(ioc->InternalCtx, ioc)) == NULL) { if ((mf = mpt_get_msg_frame(ioc->InternalCtx, ioc)) == NULL) {
dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s: no msg frames!!\n", dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s: no msg frames!!\n",
ioc->name,__FUNCTION__)); ioc->name,__func__));
return; return;
} }
@ -2187,7 +2187,7 @@ mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *m
(ioc->debug_level & MPT_DEBUG_TM )) (ioc->debug_level & MPT_DEBUG_TM ))
printk("%s: ha=%d [%d:%d:0] task_type=0x%02X " printk("%s: ha=%d [%d:%d:0] task_type=0x%02X "
"iocstatus=0x%04X\n\tloginfo=0x%08X response_code=0x%02X " "iocstatus=0x%04X\n\tloginfo=0x%08X response_code=0x%02X "
"term_cmnds=%d\n", __FUNCTION__, ioc->id, pScsiTmReply->Bus, "term_cmnds=%d\n", __func__, ioc->id, pScsiTmReply->Bus,
pScsiTmReply->TargetID, pScsiTmReq->TaskType, pScsiTmReply->TargetID, pScsiTmReq->TaskType,
le16_to_cpu(pScsiTmReply->IOCStatus), le16_to_cpu(pScsiTmReply->IOCStatus),
le32_to_cpu(pScsiTmReply->IOCLogInfo),pScsiTmReply->ResponseCode, le32_to_cpu(pScsiTmReply->IOCLogInfo),pScsiTmReply->ResponseCode,

2
drivers/scsi/advansys.c
View File

@ -2278,7 +2278,7 @@ do { \
#define ASC_DBG(lvl, format, arg...) { \ #define ASC_DBG(lvl, format, arg...) { \
if (asc_dbglvl >= (lvl)) \ if (asc_dbglvl >= (lvl)) \
printk(KERN_DEBUG "%s: %s: " format, DRV_NAME, \ printk(KERN_DEBUG "%s: %s: " format, DRV_NAME, \
__FUNCTION__ , ## arg); \ __func__ , ## arg); \
} }
#define ASC_DBG_PRT_SCSI_HOST(lvl, s) \ #define ASC_DBG_PRT_SCSI_HOST(lvl, s) \

12
drivers/scsi/aha152x.c
View File

@ -288,20 +288,20 @@ static LIST_HEAD(aha152x_host_list);
#define DO_LOCK(flags) \ #define DO_LOCK(flags) \
do { \ do { \
if(spin_is_locked(&QLOCK)) { \ if(spin_is_locked(&QLOCK)) { \
DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \ DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __func__, __LINE__, QLOCKER, QLOCKERL); \
} \ } \
DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \
spin_lock_irqsave(&QLOCK,flags); \ spin_lock_irqsave(&QLOCK,flags); \
DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \
QLOCKER=__FUNCTION__; \ QLOCKER=__func__; \
QLOCKERL=__LINE__; \ QLOCKERL=__LINE__; \
} while(0) } while(0)
#define DO_UNLOCK(flags) \ #define DO_UNLOCK(flags) \
do { \ do { \
DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \ DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __func__, __LINE__, QLOCKER, QLOCKERL); \
spin_unlock_irqrestore(&QLOCK,flags); \ spin_unlock_irqrestore(&QLOCK,flags); \
DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __func__, __LINE__); \
QLOCKER="(not locked)"; \ QLOCKER="(not locked)"; \
QLOCKERL=0; \ QLOCKERL=0; \
} while(0) } while(0)

4
drivers/scsi/aic94xx/aic94xx.h
View File

@ -39,9 +39,9 @@
#ifdef ASD_ENTER_EXIT #ifdef ASD_ENTER_EXIT
#define ENTER printk(KERN_NOTICE "%s: ENTER %s\n", ASD_DRIVER_NAME, \ #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, \ #define EXIT printk(KERN_NOTICE "%s: --EXIT %s\n", ASD_DRIVER_NAME, \
__FUNCTION__) __func__)
#else #else
#define ENTER #define ENTER
#define EXIT #define EXIT

2
drivers/scsi/aic94xx/aic94xx_hwi.c
View File

@ -1359,7 +1359,7 @@ int asd_enable_phys(struct asd_ha_struct *asd_ha, const u8 phy_mask)
struct asd_ascb *ascb_list; struct asd_ascb *ascb_list;
if (!phy_mask) { 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; return 0;
} }

46
drivers/scsi/aic94xx/aic94xx_scb.c
View File

@ -211,7 +211,7 @@ static void asd_form_port(struct asd_ha_struct *asd_ha, struct asd_phy *phy)
phy->asd_port = port; phy->asd_port = port;
} }
ASD_DPRINTK("%s: updating phy_mask 0x%x for phy%d\n", 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); asd_update_port_links(asd_ha, phy);
spin_unlock_irqrestore(&asd_ha->asd_ports_lock, flags); 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, struct asd_ascb *cp = asd_ascb_alloc_list(ascb->ha, &num,
GFP_ATOMIC); GFP_ATOMIC);
if (!cp) { if (!cp) {
asd_printk("%s: out of memory\n", __FUNCTION__); asd_printk("%s: out of memory\n", __func__);
goto out; goto out;
} }
ASD_DPRINTK("phy%d: retries:0 performing link reset seq\n", 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; struct domain_device *failed_dev = NULL;
ASD_DPRINTK("%s: REQ_TASK_ABORT, reason=0x%X\n", 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. * 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) { if (!failed_dev) {
ASD_DPRINTK("%s: Can't find task (tc=%d) to abort!\n", ASD_DPRINTK("%s: Can't find task (tc=%d) to abort!\n",
__FUNCTION__, tc_abort); __func__, tc_abort);
goto out; goto out;
} }
@ -502,7 +502,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
conn_handle = *((u16*)(&dl->status_block[1])); conn_handle = *((u16*)(&dl->status_block[1]));
conn_handle = le16_to_cpu(conn_handle); 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]); dl->status_block[3]);
/* Find the last pending task for the device... */ /* 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) { if (!last_dev_task) {
ASD_DPRINTK("%s: Device reset for idle device %d?\n", ASD_DPRINTK("%s: Device reset for idle device %d?\n",
__FUNCTION__, conn_handle); __func__, conn_handle);
goto out; goto out;
} }
@ -549,10 +549,10 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
goto out; goto out;
} }
case SIGNAL_NCQ_ERROR: case SIGNAL_NCQ_ERROR:
ASD_DPRINTK("%s: SIGNAL_NCQ_ERROR\n", __FUNCTION__); ASD_DPRINTK("%s: SIGNAL_NCQ_ERROR\n", __func__);
goto out; goto out;
case CLEAR_NCQ_ERROR: case CLEAR_NCQ_ERROR:
ASD_DPRINTK("%s: CLEAR_NCQ_ERROR\n", __FUNCTION__); ASD_DPRINTK("%s: CLEAR_NCQ_ERROR\n", __func__);
goto out; goto out;
} }
@ -560,26 +560,26 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
switch (sb_opcode) { switch (sb_opcode) {
case BYTES_DMAED: 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); asd_bytes_dmaed_tasklet(ascb, dl, edb, phy_id);
break; break;
case PRIMITIVE_RECVD: case PRIMITIVE_RECVD:
ASD_DPRINTK("%s: phy%d: PRIMITIVE_RECVD\n", __FUNCTION__, ASD_DPRINTK("%s: phy%d: PRIMITIVE_RECVD\n", __func__,
phy_id); phy_id);
asd_primitive_rcvd_tasklet(ascb, dl, phy_id); asd_primitive_rcvd_tasklet(ascb, dl, phy_id);
break; break;
case PHY_EVENT: 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); asd_phy_event_tasklet(ascb, dl);
break; break;
case LINK_RESET_ERROR: 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); phy_id);
asd_link_reset_err_tasklet(ascb, dl, phy_id); asd_link_reset_err_tasklet(ascb, dl, phy_id);
break; break;
case TIMER_EVENT: case TIMER_EVENT:
ASD_DPRINTK("%s: phy%d: TIMER_EVENT, lost dw sync\n", 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); asd_turn_led(asd_ha, phy_id, 0);
/* the device is gone */ /* the device is gone */
sas_phy_disconnected(sas_phy); 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); sas_ha->notify_port_event(sas_phy, PORTE_TIMER_EVENT);
break; break;
default: 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); phy_id, sb_opcode);
ASD_DPRINTK("edb is 0x%x! dl->opcode is 0x%x\n", ASD_DPRINTK("edb is 0x%x! dl->opcode is 0x%x\n",
edb, dl->opcode); edb, dl->opcode);
@ -654,7 +654,7 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb,
if (status != 0) { if (status != 0) {
ASD_DPRINTK("%s: phy%d status block opcode:0x%x\n", ASD_DPRINTK("%s: phy%d status block opcode:0x%x\n",
__FUNCTION__, phy_id, status); __func__, phy_id, status);
goto out; 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_ha->hw_prof.enabled_phys &= ~(1 << phy_id);
asd_turn_led(asd_ha, phy_id, 0); asd_turn_led(asd_ha, phy_id, 0);
asd_control_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; break;
case ENABLE_PHY: case ENABLE_PHY:
@ -673,40 +673,40 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb,
get_lrate_mode(phy, oob_mode); get_lrate_mode(phy, oob_mode);
asd_turn_led(asd_ha, phy_id, 1); asd_turn_led(asd_ha, phy_id, 1);
ASD_DPRINTK("%s: phy%d, lrate:0x%x, proto:0x%x\n", 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); phy->sas_phy.iproto);
} else if (oob_status & CURRENT_SPINUP_HOLD) { } else if (oob_status & CURRENT_SPINUP_HOLD) {
asd_ha->hw_prof.enabled_phys |= (1 << phy_id); asd_ha->hw_prof.enabled_phys |= (1 << phy_id);
asd_turn_led(asd_ha, phy_id, 1); 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); phy_id);
} else if (oob_status & CURRENT_ERR_MASK) { } else if (oob_status & CURRENT_ERR_MASK) {
asd_turn_led(asd_ha, phy_id, 0); asd_turn_led(asd_ha, phy_id, 0);
ASD_DPRINTK("%s: phy%d: error: oob status:0x%02x\n", 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 } else if (oob_status & (CURRENT_HOT_PLUG_CNCT
| CURRENT_DEVICE_PRESENT)) { | CURRENT_DEVICE_PRESENT)) {
asd_ha->hw_prof.enabled_phys |= (1 << phy_id); asd_ha->hw_prof.enabled_phys |= (1 << phy_id);
asd_turn_led(asd_ha, phy_id, 1); asd_turn_led(asd_ha, phy_id, 1);
ASD_DPRINTK("%s: phy%d: hot plug or device present\n", ASD_DPRINTK("%s: phy%d: hot plug or device present\n",
__FUNCTION__, phy_id); __func__, phy_id);
} else { } else {
asd_ha->hw_prof.enabled_phys |= (1 << phy_id); asd_ha->hw_prof.enabled_phys |= (1 << phy_id);
asd_turn_led(asd_ha, phy_id, 0); asd_turn_led(asd_ha, phy_id, 0);
ASD_DPRINTK("%s: phy%d: no device present: " ASD_DPRINTK("%s: phy%d: no device present: "
"oob_status:0x%x\n", "oob_status:0x%x\n",
__FUNCTION__, phy_id, oob_status); __func__, phy_id, oob_status);
} }
break; break;
case RELEASE_SPINUP_HOLD: case RELEASE_SPINUP_HOLD:
case PHY_NO_OP: case PHY_NO_OP:
case EXECUTE_HARD_RESET: 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); phy_id, control_phy->sub_func);
/* XXX finish */ /* XXX finish */
break; break;
default: 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); phy_id, control_phy->sub_func);
break; break;
} }

2
drivers/scsi/aic94xx/aic94xx_task.c
View File

@ -320,7 +320,7 @@ Again:
case TC_RESUME: case TC_RESUME:
case TC_PARTIAL_SG_LIST: case TC_PARTIAL_SG_LIST:
default: default:
ASD_DPRINTK("%s: dl opcode: 0x%x?\n", __FUNCTION__, opcode); ASD_DPRINTK("%s: dl opcode: 0x%x?\n", __func__, opcode);
break; break;
} }

18
drivers/scsi/aic94xx/aic94xx_tmf.c
View File

@ -75,12 +75,12 @@ static void asd_clear_nexus_tasklet_complete(struct asd_ascb *ascb,
struct done_list_struct *dl) struct done_list_struct *dl)
{ {
struct tasklet_completion_status *tcs = ascb->uldd_task; 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)) { if (!del_timer(&ascb->timer)) {
ASD_DPRINTK("%s: couldn't delete timer\n", __FUNCTION__); ASD_DPRINTK("%s: couldn't delete timer\n", __func__);
return; 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; tcs->dl_opcode = dl->opcode;
complete(ascb->completion); complete(ascb->completion);
asd_ascb_free(ascb); asd_ascb_free(ascb);
@ -91,7 +91,7 @@ static void asd_clear_nexus_timedout(unsigned long data)
struct asd_ascb *ascb = (void *)data; struct asd_ascb *ascb = (void *)data;
struct tasklet_completion_status *tcs = ascb->uldd_task; 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; tcs->dl_opcode = TMF_RESP_FUNC_FAILED;
complete(ascb->completion); complete(ascb->completion);
} }
@ -103,7 +103,7 @@ static void asd_clear_nexus_timedout(unsigned long data)
DECLARE_COMPLETION_ONSTACK(completion); \ DECLARE_COMPLETION_ONSTACK(completion); \
DECLARE_TCS(tcs); \ DECLARE_TCS(tcs); \
\ \
ASD_DPRINTK("%s: PRE\n", __FUNCTION__); \ ASD_DPRINTK("%s: PRE\n", __func__); \
res = 1; \ res = 1; \
ascb = asd_ascb_alloc_list(asd_ha, &res, GFP_KERNEL); \ ascb = asd_ascb_alloc_list(asd_ha, &res, GFP_KERNEL); \
if (!ascb) \ if (!ascb) \
@ -115,12 +115,12 @@ static void asd_clear_nexus_timedout(unsigned long data)
scb->header.opcode = CLEAR_NEXUS scb->header.opcode = CLEAR_NEXUS
#define CLEAR_NEXUS_POST \ #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, \ res = asd_enqueue_internal(ascb, asd_clear_nexus_tasklet_complete, \
asd_clear_nexus_timedout); \ asd_clear_nexus_timedout); \
if (res) \ if (res) \
goto out_err; \ 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); \ wait_for_completion(&completion); \
res = tcs.dl_opcode; \ res = tcs.dl_opcode; \
if (res == TC_NO_ERROR) \ 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) { if (task->task_state_flags & SAS_TASK_STATE_DONE) {
spin_unlock_irqrestore(&task->task_state_lock, flags); spin_unlock_irqrestore(&task->task_state_lock, flags);
res = TMF_RESP_FUNC_COMPLETE; 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; goto out_done;
} }
spin_unlock_irqrestore(&task->task_state_lock, flags); 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) { if (task->task_state_flags & SAS_TASK_STATE_DONE) {
spin_unlock_irqrestore(&task->task_state_lock, flags); spin_unlock_irqrestore(&task->task_state_lock, flags);
res = TMF_RESP_FUNC_COMPLETE; 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; goto out_done;
} }
spin_unlock_irqrestore(&task->task_state_lock, flags); spin_unlock_irqrestore(&task->task_state_lock, flags);

4
drivers/scsi/arm/fas216.c
View File

@ -240,7 +240,7 @@ static void __fas216_checkmagic(FAS216_Info *info, const char *func)
panic("scsi memory space corrupted in %s", func); panic("scsi memory space corrupted in %s", func);
} }
} }
#define fas216_checkmagic(info) __fas216_checkmagic((info), __FUNCTION__) #define fas216_checkmagic(info) __fas216_checkmagic((info), __func__)
#else #else
#define fas216_checkmagic(info) #define fas216_checkmagic(info)
#endif #endif
@ -2658,7 +2658,7 @@ int fas216_eh_host_reset(struct scsi_cmnd *SCpnt)
fas216_checkmagic(info); fas216_checkmagic(info);
printk("scsi%d.%c: %s: resetting host\n", printk("scsi%d.%c: %s: resetting host\n",
info->host->host_no, '0' + SCpnt->device->id, __FUNCTION__); info->host->host_no, '0' + SCpnt->device->id, __func__);
/* /*
* Reset the SCSI chip. * Reset the SCSI chip.

6
drivers/scsi/device_handler/scsi_dh_alua.c
View File

@ -97,14 +97,14 @@ static struct request *get_alua_req(struct scsi_device *sdev,
if (!rq) { if (!rq) {
sdev_printk(KERN_INFO, sdev, sdev_printk(KERN_INFO, sdev,
"%s: blk_get_request failed\n", __FUNCTION__); "%s: blk_get_request failed\n", __func__);
return NULL; return NULL;
} }
if (buflen && blk_rq_map_kern(q, rq, buffer, buflen, GFP_NOIO)) { if (buflen && blk_rq_map_kern(q, rq, buffer, buflen, GFP_NOIO)) {
blk_put_request(rq); blk_put_request(rq);
sdev_printk(KERN_INFO, sdev, sdev_printk(KERN_INFO, sdev,
"%s: blk_rq_map_kern failed\n", __FUNCTION__); "%s: blk_rq_map_kern failed\n", __func__);
return NULL; return NULL;
} }
@ -553,7 +553,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
/* Resubmit with the correct length */ /* Resubmit with the correct length */
if (realloc_buffer(h, len)) { if (realloc_buffer(h, len)) {
sdev_printk(KERN_WARNING, sdev, sdev_printk(KERN_WARNING, sdev,
"%s: kmalloc buffer failed\n",__FUNCTION__); "%s: kmalloc buffer failed\n",__func__);
/* Temporary failure, bypass */ /* Temporary failure, bypass */
return SCSI_DH_DEV_TEMP_BUSY; return SCSI_DH_DEV_TEMP_BUSY;
} }

4
drivers/scsi/ibmvscsi/ibmvfc.h
View File

@ -704,8 +704,8 @@ struct ibmvfc_host {
dev_err((vhost)->dev, ##__VA_ARGS__); \ dev_err((vhost)->dev, ##__VA_ARGS__); \
} while (0) } while (0)
#define ENTER DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Entering %s\n", __FUNCTION__)) #define ENTER DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Entering %s\n", __func__))
#define LEAVE DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Leaving %s\n", __FUNCTION__)) #define LEAVE DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Leaving %s\n", __func__))
#ifdef CONFIG_SCSI_IBMVFC_TRACE #ifdef CONFIG_SCSI_IBMVFC_TRACE
#define ibmvfc_create_trace_file(kobj, attr) sysfs_create_bin_file(kobj, attr) #define ibmvfc_create_trace_file(kobj, attr) sysfs_create_bin_file(kobj, attr)

2
drivers/scsi/ibmvscsi/ibmvstgt.c
View File

@ -55,7 +55,7 @@
/* tmp - will replace with SCSI logging stuff */ /* tmp - will replace with SCSI logging stuff */
#define eprintk(fmt, args...) \ #define eprintk(fmt, args...) \
do { \ do { \
printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \ printk("%s(%d) " fmt, __func__, __LINE__, ##args); \
} while (0) } while (0)
/* #define dprintk eprintk */ /* #define dprintk eprintk */
#define dprintk(fmt, args...) #define dprintk(fmt, args...)

2
drivers/scsi/imm.c
View File

@ -163,7 +163,7 @@ static int imm_proc_info(struct Scsi_Host *host, char *buffer, char **start,
#if IMM_DEBUG > 0 #if IMM_DEBUG > 0
#define imm_fail(x,y) printk("imm: imm_fail(%i) from %s at line %d\n",\ #define imm_fail(x,y) printk("imm: imm_fail(%i) from %s at line %d\n",\
y, __FUNCTION__, __LINE__); imm_fail_func(x,y); y, __func__, __LINE__); imm_fail_func(x,y);
static inline void static inline void
imm_fail_func(imm_struct *dev, int error_code) imm_fail_func(imm_struct *dev, int error_code)
#else #else

6
drivers/scsi/ipr.h
View File

@ -1403,10 +1403,10 @@ struct ipr_ucode_image_header {
} }
#define ipr_trace ipr_dbg("%s: %s: Line: %d\n",\ #define ipr_trace ipr_dbg("%s: %s: Line: %d\n",\
__FILE__, __FUNCTION__, __LINE__) __FILE__, __func__, __LINE__)
#define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __FUNCTION__)) #define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __func__))
#define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __FUNCTION__)) #define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __func__))
#define ipr_err_separator \ #define ipr_err_separator \
ipr_err("----------------------------------------------------------\n") ipr_err("----------------------------------------------------------\n")

16
drivers/scsi/libsas/sas_ata.c
View File

@ -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_TO:
case SAS_OPEN_REJECT: case SAS_OPEN_REJECT:
SAS_DPRINTK("%s: Saw error %d. What to do?\n", SAS_DPRINTK("%s: Saw error %d. What to do?\n",
__FUNCTION__, ts->stat); __func__, ts->stat);
return AC_ERR_OTHER; return AC_ERR_OTHER;
case SAS_ABORTED_TASK: 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) { } else if (stat->stat != SAM_STAT_GOOD) {
ac = sas_to_ata_err(stat); ac = sas_to_ata_err(stat);
if (ac) { if (ac) {
SAS_DPRINTK("%s: SAS error %x\n", __FUNCTION__, SAS_DPRINTK("%s: SAS error %x\n", __func__,
stat->stat); stat->stat);
/* We saw a SAS error. Send a vague error. */ /* We saw a SAS error. Send a vague error. */
qc->err_mask = ac; 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); res = i->dft->lldd_I_T_nexus_reset(dev);
if (res != TMF_RESP_FUNC_COMPLETE) 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) { switch (dev->sata_dev.command_set) {
case ATA_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; ap->link.device[0].class = ATA_DEV_ATA;
break; break;
case ATAPI_COMMAND_SET: 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; ap->link.device[0].class = ATA_DEV_ATAPI;
break; break;
default: default:
SAS_DPRINTK("%s: Unknown SATA command set: %d.\n", SAS_DPRINTK("%s: Unknown SATA command set: %d.\n",
__FUNCTION__, __func__,
dev->sata_dev.command_set); dev->sata_dev.command_set);
ap->link.device[0].class = ATA_DEV_UNKNOWN; ap->link.device[0].class = ATA_DEV_UNKNOWN;
break; 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; struct domain_device *dev = ap->private_data;
SAS_DPRINTK("STUB %s\n", __FUNCTION__); SAS_DPRINTK("STUB %s\n", __func__);
switch (sc_reg_in) { switch (sc_reg_in) {
case SCR_STATUS: case SCR_STATUS:
dev->sata_dev.sstatus = val; 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; struct domain_device *dev = ap->private_data;
SAS_DPRINTK("STUB %s\n", __FUNCTION__); SAS_DPRINTK("STUB %s\n", __func__);
switch (sc_reg_in) { switch (sc_reg_in) {
case SCR_STATUS: case SCR_STATUS:
*val = dev->sata_dev.sstatus; *val = dev->sata_dev.sstatus;

12
drivers/scsi/libsas/sas_expander.c
View File

@ -121,7 +121,7 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size,
break; break;
} else { } else {
SAS_DPRINTK("%s: task to dev %016llx response: 0x%x " 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), SAS_ADDR(dev->sas_addr),
task->task_status.resp, task->task_status.resp,
task->task_status.stat); task->task_status.stat);
@ -1279,7 +1279,7 @@ static int sas_configure_present(struct domain_device *dev, int phy_id,
goto out; goto out;
} else if (res != SMP_RESP_FUNC_ACC) { } else if (res != SMP_RESP_FUNC_ACC) {
SAS_DPRINTK("%s: dev %016llx phy 0x%x index 0x%x " 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); SAS_ADDR(dev->sas_addr), phy_id, i, res);
goto out; goto out;
} }
@ -1901,7 +1901,7 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
if (!rsp) { if (!rsp) {
printk("%s: space for a smp response is missing\n", printk("%s: space for a smp response is missing\n",
__FUNCTION__); __func__);
return -EINVAL; return -EINVAL;
} }
@ -1914,20 +1914,20 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
if (type != SAS_EDGE_EXPANDER_DEVICE && if (type != SAS_EDGE_EXPANDER_DEVICE &&
type != SAS_FANOUT_EXPANDER_DEVICE) { type != SAS_FANOUT_EXPANDER_DEVICE) {
printk("%s: can we send a smp request to a device?\n", printk("%s: can we send a smp request to a device?\n",
__FUNCTION__); __func__);
return -EINVAL; return -EINVAL;
} }
dev = sas_find_dev_by_rphy(rphy); dev = sas_find_dev_by_rphy(rphy);
if (!dev) { if (!dev) {
printk("%s: fail to find a domain_device?\n", __FUNCTION__); printk("%s: fail to find a domain_device?\n", __func__);
return -EINVAL; return -EINVAL;
} }
/* do we need to support multiple segments? */ /* do we need to support multiple segments? */
if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) { if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) {
printk("%s: multiple segments req %u %u, rsp %u %u\n", 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); rsp->bio->bi_vcnt, rsp->data_len);
return -EINVAL; return -EINVAL;
} }

4
drivers/scsi/libsas/sas_port.c
View File

@ -50,7 +50,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
sas_deform_port(phy); sas_deform_port(phy);
else { else {
SAS_DPRINTK("%s: phy%d belongs to port%d already(%d)!\n", 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); phy->port->num_phys);
return; return;
} }
@ -78,7 +78,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
if (i >= sas_ha->num_phys) { if (i >= sas_ha->num_phys) {
printk(KERN_NOTICE "%s: couldn't find a free port, bug?\n", printk(KERN_NOTICE "%s: couldn't find a free port, bug?\n",
__FUNCTION__); __func__);
spin_unlock_irqrestore(&sas_ha->phy_port_lock, flags); spin_unlock_irqrestore(&sas_ha->phy_port_lock, flags);
return; return;
} }

30
drivers/scsi/libsas/sas_scsi_host.c
View File

@ -343,7 +343,7 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task)
flags); flags);
SAS_DPRINTK("%s: task 0x%p aborted from " SAS_DPRINTK("%s: task 0x%p aborted from "
"task_queue\n", "task_queue\n",
__FUNCTION__, task); __func__, task);
return TASK_IS_ABORTED; 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++) { 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); res = si->dft->lldd_abort_task(task);
spin_lock_irqsave(&task->task_state_lock, flags); spin_lock_irqsave(&task->task_state_lock, flags);
if (task->task_state_flags & SAS_TASK_STATE_DONE) { if (task->task_state_flags & SAS_TASK_STATE_DONE) {
spin_unlock_irqrestore(&task->task_state_lock, flags); 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); task);
return TASK_IS_DONE; 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) { if (res == TMF_RESP_FUNC_COMPLETE) {
SAS_DPRINTK("%s: task 0x%p is aborted\n", SAS_DPRINTK("%s: task 0x%p is aborted\n",
__FUNCTION__, task); __func__, task);
return TASK_IS_ABORTED; return TASK_IS_ABORTED;
} else if (si->dft->lldd_query_task) { } else if (si->dft->lldd_query_task) {
SAS_DPRINTK("%s: querying task 0x%p\n", SAS_DPRINTK("%s: querying task 0x%p\n",
__FUNCTION__, task); __func__, task);
res = si->dft->lldd_query_task(task); res = si->dft->lldd_query_task(task);
switch (res) { switch (res) {
case TMF_RESP_FUNC_SUCC: case TMF_RESP_FUNC_SUCC:
SAS_DPRINTK("%s: task 0x%p at LU\n", SAS_DPRINTK("%s: task 0x%p at LU\n",
__FUNCTION__, task); __func__, task);
return TASK_IS_AT_LU; return TASK_IS_AT_LU;
case TMF_RESP_FUNC_COMPLETE: case TMF_RESP_FUNC_COMPLETE:
SAS_DPRINTK("%s: task 0x%p not at LU\n", SAS_DPRINTK("%s: task 0x%p not at LU\n",
__FUNCTION__, task); __func__, task);
return TASK_IS_NOT_AT_LU; return TASK_IS_NOT_AT_LU;
case TMF_RESP_FUNC_FAILED: case TMF_RESP_FUNC_FAILED:
SAS_DPRINTK("%s: task 0x%p failed to abort\n", SAS_DPRINTK("%s: task 0x%p failed to abort\n",
__FUNCTION__, task); __func__, task);
return TASK_ABORT_FAILED; return TASK_ABORT_FAILED;
} }
@ -545,7 +545,7 @@ Again:
if (need_reset) { if (need_reset) {
SAS_DPRINTK("%s: task 0x%p requests reset\n", SAS_DPRINTK("%s: task 0x%p requests reset\n",
__FUNCTION__, task); __func__, task);
goto reset; goto reset;
} }
@ -556,13 +556,13 @@ Again:
switch (res) { switch (res) {
case TASK_IS_DONE: 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); task);
sas_eh_finish_cmd(cmd); sas_eh_finish_cmd(cmd);
continue; continue;
case TASK_IS_ABORTED: case TASK_IS_ABORTED:
SAS_DPRINTK("%s: task 0x%p is aborted\n", SAS_DPRINTK("%s: task 0x%p is aborted\n",
__FUNCTION__, task); __func__, task);
sas_eh_finish_cmd(cmd); sas_eh_finish_cmd(cmd);
continue; continue;
case TASK_IS_AT_LU: case TASK_IS_AT_LU:
@ -633,7 +633,7 @@ Again:
} }
return list_empty(work_q); return list_empty(work_q);
clear_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) list_for_each_entry_safe(cmd, n, work_q, eh_entry)
sas_eh_finish_cmd(cmd); 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); list_splice_init(&shost->eh_cmd_q, &eh_work_q);
spin_unlock_irqrestore(shost->host_lock, flags); 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 * Deal with commands that still have SAS tasks (i.e. they didn't
* complete via the normal sas_task completion mechanism) * complete via the normal sas_task completion mechanism)
@ -669,7 +669,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)
out: out:
scsi_eh_flush_done_q(&ha->eh_done_q); scsi_eh_flush_done_q(&ha->eh_done_q);
SAS_DPRINTK("--- Exit %s\n", __FUNCTION__); SAS_DPRINTK("--- Exit %s\n", __func__);
return; return;
} }
@ -990,7 +990,7 @@ int __sas_task_abort(struct sas_task *task)
if (task->task_state_flags & SAS_TASK_STATE_ABORTED || if (task->task_state_flags & SAS_TASK_STATE_ABORTED ||
task->task_state_flags & SAS_TASK_STATE_DONE) { task->task_state_flags & SAS_TASK_STATE_DONE) {
spin_unlock_irqrestore(&task->task_state_lock, flags); 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); task);
return 0; return 0;
} }

2
drivers/scsi/libsrp.c
View File

@ -39,7 +39,7 @@ enum srp_task_attributes {
/* tmp - will replace with SCSI logging stuff */ /* tmp - will replace with SCSI logging stuff */
#define eprintk(fmt, args...) \ #define eprintk(fmt, args...) \
do { \ do { \
printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \ printk("%s(%d) " fmt, __func__, __LINE__, ##args); \
} while (0) } while (0)
/* #define dprintk eprintk */ /* #define dprintk eprintk */
#define dprintk(fmt, args...) #define dprintk(fmt, args...)

4
drivers/scsi/lpfc/lpfc_init.c
View File

@ -2083,7 +2083,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
if (iocbq_entry == NULL) { if (iocbq_entry == NULL) {
printk(KERN_ERR "%s: only allocated %d iocbs of " printk(KERN_ERR "%s: only allocated %d iocbs of "
"expected %d count. Unloading driver.\n", "expected %d count. Unloading driver.\n",
__FUNCTION__, i, LPFC_IOCB_LIST_CNT); __func__, i, LPFC_IOCB_LIST_CNT);
error = -ENOMEM; error = -ENOMEM;
goto out_free_iocbq; goto out_free_iocbq;
} }
@ -2093,7 +2093,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
kfree (iocbq_entry); kfree (iocbq_entry);
printk(KERN_ERR "%s: failed to allocate IOTAG. " printk(KERN_ERR "%s: failed to allocate IOTAG. "
"Unloading driver.\n", "Unloading driver.\n",
__FUNCTION__); __func__);
error = -ENOMEM; error = -ENOMEM;
goto out_free_iocbq; goto out_free_iocbq;
} }

2
drivers/scsi/lpfc/lpfc_scsi.c
View File

@ -341,7 +341,7 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
if (lpfc_cmd->seg_cnt > phba->cfg_sg_seg_cnt) { if (lpfc_cmd->seg_cnt > phba->cfg_sg_seg_cnt) {
printk(KERN_ERR "%s: Too many sg segments from " printk(KERN_ERR "%s: Too many sg segments from "
"dma_map_sg. Config %d, seg_cnt %d", "dma_map_sg. Config %d, seg_cnt %d",
__FUNCTION__, phba->cfg_sg_seg_cnt, __func__, phba->cfg_sg_seg_cnt,
lpfc_cmd->seg_cnt); lpfc_cmd->seg_cnt);
scsi_dma_unmap(scsi_cmnd); scsi_dma_unmap(scsi_cmnd);
return 1; return 1;

6
drivers/scsi/lpfc/lpfc_sli.c
View File

@ -219,7 +219,7 @@ lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)
case CMD_IOCB_LOGENTRY_CN: case CMD_IOCB_LOGENTRY_CN:
case CMD_IOCB_LOGENTRY_ASYNC_CN: case CMD_IOCB_LOGENTRY_ASYNC_CN:
printk("%s - Unhandled SLI-3 Command x%x\n", printk("%s - Unhandled SLI-3 Command x%x\n",
__FUNCTION__, iocb_cmnd); __func__, iocb_cmnd);
type = LPFC_UNKNOWN_IOCB; type = LPFC_UNKNOWN_IOCB;
break; break;
default: default:
@ -1715,7 +1715,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
rspiocbp = __lpfc_sli_get_iocbq(phba); rspiocbp = __lpfc_sli_get_iocbq(phba);
if (rspiocbp == NULL) { if (rspiocbp == NULL) {
printk(KERN_ERR "%s: out of buffers! Failing " printk(KERN_ERR "%s: out of buffers! Failing "
"completion.\n", __FUNCTION__); "completion.\n", __func__);
break; break;
} }
@ -3793,7 +3793,7 @@ lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, struct lpfc_vport *vport,
break; break;
default: default:
printk(KERN_ERR "%s: Unknown context cmd type, value %d\n", printk(KERN_ERR "%s: Unknown context cmd type, value %d\n",
__FUNCTION__, ctx_cmd); __func__, ctx_cmd);
break; break;
} }

2
drivers/scsi/megaraid/mega_common.h
View File

@ -265,7 +265,7 @@ typedef struct {
#define ASSERT(expression) \ #define ASSERT(expression) \
if (!(expression)) { \ if (!(expression)) { \
ASSERT_ACTION("assertion failed:(%s), file: %s, line: %d:%s\n", \ ASSERT_ACTION("assertion failed:(%s), file: %s, line: %d:%s\n", \
#expression, __FILE__, __LINE__, __FUNCTION__); \ #expression, __FILE__, __LINE__, __func__); \
} }
#else #else
#define ASSERT(expression) #define ASSERT(expression)

16
drivers/scsi/megaraid/megaraid_mbox.c
View File

@ -458,7 +458,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
if (adapter == NULL) { if (adapter == NULL) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid: out of memory, %s %d.\n", __FUNCTION__, __LINE__)); "megaraid: out of memory, %s %d.\n", __func__, __LINE__));
goto out_probe_one; goto out_probe_one;
} }
@ -1002,7 +1002,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
if (!raid_dev->una_mbox64) { if (!raid_dev->una_mbox64) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid: out of memory, %s %d\n", __FUNCTION__, "megaraid: out of memory, %s %d\n", __func__,
__LINE__)); __LINE__));
return -1; return -1;
} }
@ -1030,7 +1030,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
if (!adapter->ibuf) { if (!adapter->ibuf) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid: out of memory, %s %d\n", __FUNCTION__, "megaraid: out of memory, %s %d\n", __func__,
__LINE__)); __LINE__));
goto out_free_common_mbox; goto out_free_common_mbox;
@ -1052,7 +1052,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
if (adapter->kscb_list == NULL) { if (adapter->kscb_list == NULL) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid: out of memory, %s %d\n", __FUNCTION__, "megaraid: out of memory, %s %d\n", __func__,
__LINE__)); __LINE__));
goto out_free_ibuf; goto out_free_ibuf;
} }
@ -1060,7 +1060,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
// memory allocation for our command packets // memory allocation for our command packets
if (megaraid_mbox_setup_dma_pools(adapter) != 0) { if (megaraid_mbox_setup_dma_pools(adapter) != 0) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid: out of memory, %s %d\n", __FUNCTION__, "megaraid: out of memory, %s %d\n", __func__,
__LINE__)); __LINE__));
goto out_free_scb_list; goto out_free_scb_list;
} }
@ -2981,7 +2981,7 @@ megaraid_mbox_product_info(adapter_t *adapter)
if (pinfo == NULL) { if (pinfo == NULL) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid: out of memory, %s %d\n", __FUNCTION__, "megaraid: out of memory, %s %d\n", __func__,
__LINE__)); __LINE__));
return -1; return -1;
@ -3508,7 +3508,7 @@ megaraid_cmm_register(adapter_t *adapter)
if (adapter->uscb_list == NULL) { if (adapter->uscb_list == NULL) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid: out of memory, %s %d\n", __FUNCTION__, "megaraid: out of memory, %s %d\n", __func__,
__LINE__)); __LINE__));
return -1; return -1;
} }
@ -3879,7 +3879,7 @@ megaraid_sysfs_alloc_resources(adapter_t *adapter)
!raid_dev->sysfs_buffer) { !raid_dev->sysfs_buffer) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid: out of memory, %s %d\n", __FUNCTION__, "megaraid: out of memory, %s %d\n", __func__,
__LINE__)); __LINE__));
rval = -ENOMEM; rval = -ENOMEM;

4
drivers/scsi/megaraid/megaraid_mm.c
View File

@ -929,7 +929,7 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
!adapter->pthru_dma_pool) { !adapter->pthru_dma_pool) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid cmm: out of memory, %s %d\n", __FUNCTION__, "megaraid cmm: out of memory, %s %d\n", __func__,
__LINE__)); __LINE__));
rval = (-ENOMEM); rval = (-ENOMEM);
@ -957,7 +957,7 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING
"megaraid cmm: out of memory, %s %d\n", "megaraid cmm: out of memory, %s %d\n",
__FUNCTION__, __LINE__)); __func__, __LINE__));
rval = (-ENOMEM); rval = (-ENOMEM);

4
drivers/scsi/nsp32.c
View File

@ -299,9 +299,9 @@ static struct scsi_host_template nsp32_template = {
#else #else
# define NSP32_DEBUG_MASK 0xffffff # define NSP32_DEBUG_MASK 0xffffff
# define nsp32_msg(type, args...) \ # define nsp32_msg(type, args...) \
nsp32_message (__FUNCTION__, __LINE__, (type), args) nsp32_message (__func__, __LINE__, (type), args)
# define nsp32_dbg(mask, args...) \ # define nsp32_dbg(mask, args...) \
nsp32_dmessage(__FUNCTION__, __LINE__, (mask), args) nsp32_dmessage(__func__, __LINE__, (mask), args)
#endif #endif
#define NSP32_DEBUG_QUEUECOMMAND BIT(0) #define NSP32_DEBUG_QUEUECOMMAND BIT(0)

2
drivers/scsi/nsp32_debug.c
View File

@ -88,7 +88,7 @@ static void print_commandk (unsigned char *command)
int i,s; int i,s;
// printk(KERN_DEBUG); // printk(KERN_DEBUG);
print_opcodek(command[0]); print_opcodek(command[0]);
/*printk(KERN_DEBUG "%s ", __FUNCTION__);*/ /*printk(KERN_DEBUG "%s ", __func__);*/
if ((command[0] >> 5) == 6 || if ((command[0] >> 5) == 6 ||
(command[0] >> 5) == 7 ) { (command[0] >> 5) == 7 ) {
s = 12; /* vender specific */ s = 12; /* vender specific */

4
drivers/scsi/pcmcia/nsp_cs.c
View File

@ -107,9 +107,9 @@ static nsp_hw_data nsp_data_base; /* attach <-> detect glue */
#else #else
# define NSP_DEBUG_MASK 0xffffff # define NSP_DEBUG_MASK 0xffffff
# define nsp_msg(type, args...) \ # define nsp_msg(type, args...) \
nsp_cs_message (__FUNCTION__, __LINE__, (type), args) nsp_cs_message (__func__, __LINE__, (type), args)
# define nsp_dbg(mask, args...) \ # define nsp_dbg(mask, args...) \
nsp_cs_dmessage(__FUNCTION__, __LINE__, (mask), args) nsp_cs_dmessage(__func__, __LINE__, (mask), args)
#endif #endif
#define NSP_DEBUG_QUEUECOMMAND BIT(0) #define NSP_DEBUG_QUEUECOMMAND BIT(0)

2
drivers/scsi/pcmcia/nsp_debug.c
View File

@ -90,7 +90,7 @@ static void print_commandk (unsigned char *command)
int i, s; int i, s;
printk(KERN_DEBUG); printk(KERN_DEBUG);
print_opcodek(command[0]); print_opcodek(command[0]);
/*printk(KERN_DEBUG "%s ", __FUNCTION__);*/ /*printk(KERN_DEBUG "%s ", __func__);*/
if ((command[0] >> 5) == 6 || if ((command[0] >> 5) == 6 ||
(command[0] >> 5) == 7 ) { (command[0] >> 5) == 7 ) {
s = 12; /* vender specific */ s = 12; /* vender specific */

2
drivers/scsi/ppa.c
View File

@ -171,7 +171,7 @@ static int device_check(ppa_struct *dev);
#if PPA_DEBUG > 0 #if PPA_DEBUG > 0
#define ppa_fail(x,y) printk("ppa: ppa_fail(%i) from %s at line %d\n",\ #define ppa_fail(x,y) printk("ppa: ppa_fail(%i) from %s at line %d\n",\
y, __FUNCTION__, __LINE__); ppa_fail_func(x,y); y, __func__, __LINE__); ppa_fail_func(x,y);
static inline void ppa_fail_func(ppa_struct *dev, int error_code) static inline void ppa_fail_func(ppa_struct *dev, int error_code)
#else #else
static inline void ppa_fail(ppa_struct *dev, int error_code) static inline void ppa_fail(ppa_struct *dev, int error_code)

12
drivers/scsi/qla1280.c
View File

@ -1695,7 +1695,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
risc_code_size = *ql1280_board_tbl[ha->devnum].fwlen; risc_code_size = *ql1280_board_tbl[ha->devnum].fwlen;
dprintk(1, "%s: DMA RISC code (%i) words\n", dprintk(1, "%s: DMA RISC code (%i) words\n",
__FUNCTION__, risc_code_size); __func__, risc_code_size);
num = 0; num = 0;
while (risc_code_size > 0) { while (risc_code_size > 0) {
@ -1721,7 +1721,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
mb[7] = pci_dma_hi32(ha->request_dma) & 0xffff; mb[7] = pci_dma_hi32(ha->request_dma) & 0xffff;
mb[6] = pci_dma_hi32(ha->request_dma) >> 16; mb[6] = pci_dma_hi32(ha->request_dma) >> 16;
dprintk(2, "%s: op=%d 0x%p = 0x%4x,0x%4x,0x%4x,0x%4x\n", dprintk(2, "%s: op=%d 0x%p = 0x%4x,0x%4x,0x%4x,0x%4x\n",
__FUNCTION__, mb[0], __func__, mb[0],
(void *)(long)ha->request_dma, (void *)(long)ha->request_dma,
mb[6], mb[7], mb[2], mb[3]); mb[6], mb[7], mb[2], mb[3]);
err = qla1280_mailbox_command(ha, BIT_4 | BIT_3 | BIT_2 | err = qla1280_mailbox_command(ha, BIT_4 | BIT_3 | BIT_2 |
@ -1753,10 +1753,10 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
if (tbuf[i] != sp[i] && warn++ < 10) { if (tbuf[i] != sp[i] && warn++ < 10) {
printk(KERN_ERR "%s: FW compare error @ " printk(KERN_ERR "%s: FW compare error @ "
"byte(0x%x) loop#=%x\n", "byte(0x%x) loop#=%x\n",
__FUNCTION__, i, num); __func__, i, num);
printk(KERN_ERR "%s: FWbyte=%x " printk(KERN_ERR "%s: FWbyte=%x "
"FWfromChip=%x\n", "FWfromChip=%x\n",
__FUNCTION__, sp[i], tbuf[i]); __func__, sp[i], tbuf[i]);
/*break; */ /*break; */
} }
} }
@ -1781,7 +1781,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha)
int err; int err;
dprintk(1, "%s: Verifying checksum of loaded RISC code.\n", dprintk(1, "%s: Verifying checksum of loaded RISC code.\n",
__FUNCTION__); __func__);
/* Verify checksum of loaded RISC code. */ /* Verify checksum of loaded RISC code. */
mb[0] = MBC_VERIFY_CHECKSUM; mb[0] = MBC_VERIFY_CHECKSUM;
@ -1794,7 +1794,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha)
} }
/* Start firmware execution. */ /* Start firmware execution. */
dprintk(1, "%s: start firmware running.\n", __FUNCTION__); dprintk(1, "%s: start firmware running.\n", __func__);
mb[0] = MBC_EXECUTE_FIRMWARE; mb[0] = MBC_EXECUTE_FIRMWARE;
mb[1] = *ql1280_board_tbl[ha->devnum].fwstart; mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
err = qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]); err = qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]);

12
drivers/scsi/scsi_debug.c
View File

@ -1753,7 +1753,7 @@ static struct sdebug_dev_info * devInfoReg(struct scsi_device * sdev)
open_devip = sdebug_device_create(sdbg_host, GFP_ATOMIC); open_devip = sdebug_device_create(sdbg_host, GFP_ATOMIC);
if (!open_devip) { if (!open_devip) {
printk(KERN_ERR "%s: out of memory at line %d\n", printk(KERN_ERR "%s: out of memory at line %d\n",
__FUNCTION__, __LINE__); __func__, __LINE__);
return NULL; return NULL;
} }
} }
@ -2656,7 +2656,7 @@ static int sdebug_add_adapter(void)
sdbg_host = kzalloc(sizeof(*sdbg_host),GFP_KERNEL); sdbg_host = kzalloc(sizeof(*sdbg_host),GFP_KERNEL);
if (NULL == sdbg_host) { if (NULL == sdbg_host) {
printk(KERN_ERR "%s: out of memory at line %d\n", printk(KERN_ERR "%s: out of memory at line %d\n",
__FUNCTION__, __LINE__); __func__, __LINE__);
return -ENOMEM; return -ENOMEM;
} }
@ -2667,7 +2667,7 @@ static int sdebug_add_adapter(void)
sdbg_devinfo = sdebug_device_create(sdbg_host, GFP_KERNEL); sdbg_devinfo = sdebug_device_create(sdbg_host, GFP_KERNEL);
if (!sdbg_devinfo) { if (!sdbg_devinfo) {
printk(KERN_ERR "%s: out of memory at line %d\n", printk(KERN_ERR "%s: out of memory at line %d\n",
__FUNCTION__, __LINE__); __func__, __LINE__);
error = -ENOMEM; error = -ENOMEM;
goto clean; goto clean;
} }
@ -2987,7 +2987,7 @@ static int sdebug_driver_probe(struct device * dev)
hpnt = scsi_host_alloc(&sdebug_driver_template, sizeof(sdbg_host)); hpnt = scsi_host_alloc(&sdebug_driver_template, sizeof(sdbg_host));
if (NULL == hpnt) { if (NULL == hpnt) {
printk(KERN_ERR "%s: scsi_register failed\n", __FUNCTION__); printk(KERN_ERR "%s: scsi_register failed\n", __func__);
error = -ENODEV; error = -ENODEV;
return error; return error;
} }
@ -3002,7 +3002,7 @@ static int sdebug_driver_probe(struct device * dev)
error = scsi_add_host(hpnt, &sdbg_host->dev); error = scsi_add_host(hpnt, &sdbg_host->dev);
if (error) { if (error) {
printk(KERN_ERR "%s: scsi_add_host failed\n", __FUNCTION__); printk(KERN_ERR "%s: scsi_add_host failed\n", __func__);
error = -ENODEV; error = -ENODEV;
scsi_host_put(hpnt); scsi_host_put(hpnt);
} else } else
@ -3021,7 +3021,7 @@ static int sdebug_driver_remove(struct device * dev)
if (!sdbg_host) { if (!sdbg_host) {
printk(KERN_ERR "%s: Unable to locate host info\n", printk(KERN_ERR "%s: Unable to locate host info\n",
__FUNCTION__); __func__);
return -ENODEV; return -ENODEV;
} }

6
drivers/scsi/scsi_devinfo.c
View File

@ -272,7 +272,7 @@ static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length,
} }
if (from_length > to_length) if (from_length > to_length)
printk(KERN_WARNING "%s: %s string '%s' is too long\n", printk(KERN_WARNING "%s: %s string '%s' is too long\n",
__FUNCTION__, name, from); __func__, name, from);
} }
/** /**
@ -298,7 +298,7 @@ static int scsi_dev_info_list_add(int compatible, char *vendor, char *model,
devinfo = kmalloc(sizeof(*devinfo), GFP_KERNEL); devinfo = kmalloc(sizeof(*devinfo), GFP_KERNEL);
if (!devinfo) { if (!devinfo) {
printk(KERN_ERR "%s: no memory\n", __FUNCTION__); printk(KERN_ERR "%s: no memory\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
@ -363,7 +363,7 @@ static int scsi_dev_info_list_add_str(char *dev_list)
strflags = strsep(&next, next_check); strflags = strsep(&next, next_check);
if (!model || !strflags) { if (!model || !strflags) {
printk(KERN_ERR "%s: bad dev info string '%s' '%s'" printk(KERN_ERR "%s: bad dev info string '%s' '%s'"
" '%s'\n", __FUNCTION__, vendor, model, " '%s'\n", __func__, vendor, model,
strflags); strflags);
res = -EINVAL; res = -EINVAL;
} else } else

26
drivers/scsi/scsi_error.c
View File

@ -139,7 +139,7 @@ void scsi_add_timer(struct scsi_cmnd *scmd, int timeout,
scmd->eh_timeout.function = (void (*)(unsigned long)) complete; scmd->eh_timeout.function = (void (*)(unsigned long)) complete;
SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p, time:" SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p, time:"
" %d, (%p)\n", __FUNCTION__, " %d, (%p)\n", __func__,
scmd, timeout, complete)); scmd, timeout, complete));
add_timer(&scmd->eh_timeout); add_timer(&scmd->eh_timeout);
@ -163,7 +163,7 @@ int scsi_delete_timer(struct scsi_cmnd *scmd)
rtn = del_timer(&scmd->eh_timeout); rtn = del_timer(&scmd->eh_timeout);
SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p," SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p,"
" rtn: %d\n", __FUNCTION__, " rtn: %d\n", __func__,
scmd, rtn)); scmd, rtn));
scmd->eh_timeout.data = (unsigned long)NULL; scmd->eh_timeout.data = (unsigned long)NULL;
@ -233,7 +233,7 @@ int scsi_block_when_processing_errors(struct scsi_device *sdev)
online = scsi_device_online(sdev); online = scsi_device_online(sdev);
SCSI_LOG_ERROR_RECOVERY(5, printk("%s: rtn: %d\n", __FUNCTION__, SCSI_LOG_ERROR_RECOVERY(5, printk("%s: rtn: %d\n", __func__,
online)); online));
return online; return online;
@ -271,7 +271,7 @@ static inline void scsi_eh_prt_fail_stats(struct Scsi_Host *shost,
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
sdev_printk(KERN_INFO, sdev, sdev_printk(KERN_INFO, sdev,
"%s: cmds failed: %d, cancel: %d\n", "%s: cmds failed: %d, cancel: %d\n",
__FUNCTION__, cmd_failed, __func__, cmd_failed,
cmd_cancel)); cmd_cancel));
cmd_cancel = 0; cmd_cancel = 0;
cmd_failed = 0; cmd_failed = 0;
@ -473,7 +473,7 @@ static void scsi_eh_done(struct scsi_cmnd *scmd)
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
printk("%s scmd: %p result: %x\n", printk("%s scmd: %p result: %x\n",
__FUNCTION__, scmd, scmd->result)); __func__, scmd, scmd->result));
eh_action = scmd->device->host->eh_action; eh_action = scmd->device->host->eh_action;
if (eh_action) if (eh_action)
@ -490,7 +490,7 @@ static int scsi_try_host_reset(struct scsi_cmnd *scmd)
int rtn; int rtn;
SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Host RST\n", SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Host RST\n",
__FUNCTION__)); __func__));
if (!scmd->device->host->hostt->eh_host_reset_handler) if (!scmd->device->host->hostt->eh_host_reset_handler)
return FAILED; return FAILED;
@ -519,7 +519,7 @@ static int scsi_try_bus_reset(struct scsi_cmnd *scmd)
int rtn; int rtn;
SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Bus RST\n", SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Bus RST\n",
__FUNCTION__)); __func__));
if (!scmd->device->host->hostt->eh_bus_reset_handler) if (!scmd->device->host->hostt->eh_bus_reset_handler)
return FAILED; return FAILED;
@ -774,7 +774,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
printk("%s: scmd: %p, timeleft: %ld\n", printk("%s: scmd: %p, timeleft: %ld\n",
__FUNCTION__, scmd, timeleft)); __func__, scmd, timeleft));
/* /*
* If there is time left scsi_eh_done got called, and we will * If there is time left scsi_eh_done got called, and we will
@ -786,7 +786,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
rtn = scsi_eh_completed_normally(scmd); rtn = scsi_eh_completed_normally(scmd);
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
printk("%s: scsi_eh_completed_normally %x\n", printk("%s: scsi_eh_completed_normally %x\n",
__FUNCTION__, rtn)); __func__, rtn));
switch (rtn) { switch (rtn) {
case SUCCESS: case SUCCESS:
@ -921,7 +921,7 @@ retry_tur:
rtn = scsi_send_eh_cmnd(scmd, tur_command, 6, SENSE_TIMEOUT, 0); rtn = scsi_send_eh_cmnd(scmd, tur_command, 6, SENSE_TIMEOUT, 0);
SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd %p rtn %x\n", SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd %p rtn %x\n",
__FUNCTION__, scmd, rtn)); __func__, scmd, rtn));
switch (rtn) { switch (rtn) {
case NEEDS_RETRY: case NEEDS_RETRY:
@ -1304,7 +1304,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
if (!scsi_device_online(scmd->device)) { if (!scsi_device_online(scmd->device)) {
SCSI_LOG_ERROR_RECOVERY(5, printk("%s: device offline - report" SCSI_LOG_ERROR_RECOVERY(5, printk("%s: device offline - report"
" as SUCCESS\n", " as SUCCESS\n",
__FUNCTION__)); __func__));
return SUCCESS; return SUCCESS;
} }
@ -1519,7 +1519,7 @@ static void scsi_restart_operations(struct Scsi_Host *shost)
* ioctls to queued block devices. * ioctls to queued block devices.
*/ */
SCSI_LOG_ERROR_RECOVERY(3, printk("%s: waking up host to restart\n", SCSI_LOG_ERROR_RECOVERY(3, printk("%s: waking up host to restart\n",
__FUNCTION__)); __func__));
spin_lock_irqsave(shost->host_lock, flags); spin_lock_irqsave(shost->host_lock, flags);
if (scsi_host_set_state(shost, SHOST_RUNNING)) if (scsi_host_set_state(shost, SHOST_RUNNING))
@ -1843,7 +1843,7 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
*/ */
SCSI_LOG_ERROR_RECOVERY(3, SCSI_LOG_ERROR_RECOVERY(3,
printk("%s: waking up host to restart after TMF\n", printk("%s: waking up host to restart after TMF\n",
__FUNCTION__)); __func__));
wake_up(&shost->host_wait); wake_up(&shost->host_wait);

6
drivers/scsi/scsi_lib.c
View File

@ -1395,7 +1395,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
if (unlikely(cmd == NULL)) { if (unlikely(cmd == NULL)) {
printk(KERN_CRIT "impossible request in %s.\n", printk(KERN_CRIT "impossible request in %s.\n",
__FUNCTION__); __func__);
BUG(); BUG();
} }
@ -1519,7 +1519,7 @@ static void scsi_request_fn(struct request_queue *q)
printk(KERN_CRIT "impossible request in %s.\n" printk(KERN_CRIT "impossible request in %s.\n"
"please mail a stack trace to " "please mail a stack trace to "
"linux-scsi@vger.kernel.org\n", "linux-scsi@vger.kernel.org\n",
__FUNCTION__); __func__);
blk_dump_rq_flags(req, "foo"); blk_dump_rq_flags(req, "foo");
BUG(); BUG();
} }
@ -2529,7 +2529,7 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sgl, int sg_count,
if (unlikely(i == sg_count)) { if (unlikely(i == sg_count)) {
printk(KERN_ERR "%s: Bytes in sg: %zu, requested offset %zu, " printk(KERN_ERR "%s: Bytes in sg: %zu, requested offset %zu, "
"elements %d\n", "elements %d\n",
__FUNCTION__, sg_len, *offset, sg_count); __func__, sg_len, *offset, sg_count);
WARN_ON(1); WARN_ON(1);
return NULL; return NULL;
} }

8
drivers/scsi/scsi_netlink.c
View File

@ -55,7 +55,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
if ((nlh->nlmsg_len < (sizeof(*nlh) + sizeof(*hdr))) || if ((nlh->nlmsg_len < (sizeof(*nlh) + sizeof(*hdr))) ||
(skb->len < nlh->nlmsg_len)) { (skb->len < nlh->nlmsg_len)) {
printk(KERN_WARNING "%s: discarding partial skb\n", printk(KERN_WARNING "%s: discarding partial skb\n",
__FUNCTION__); __func__);
return; return;
} }
@ -82,7 +82,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
if (nlh->nlmsg_len < (sizeof(*nlh) + hdr->msglen)) { if (nlh->nlmsg_len < (sizeof(*nlh) + hdr->msglen)) {
printk(KERN_WARNING "%s: discarding partial message\n", printk(KERN_WARNING "%s: discarding partial message\n",
__FUNCTION__); __func__);
return; return;
} }
@ -139,7 +139,7 @@ scsi_netlink_init(void)
error = netlink_register_notifier(&scsi_netlink_notifier); error = netlink_register_notifier(&scsi_netlink_notifier);
if (error) { if (error) {
printk(KERN_ERR "%s: register of event handler failed - %d\n", printk(KERN_ERR "%s: register of event handler failed - %d\n",
__FUNCTION__, error); __func__, error);
return; return;
} }
@ -148,7 +148,7 @@ scsi_netlink_init(void)
THIS_MODULE); THIS_MODULE);
if (!scsi_nl_sock) { if (!scsi_nl_sock) {
printk(KERN_ERR "%s: register of recieve handler failed\n", printk(KERN_ERR "%s: register of recieve handler failed\n",
__FUNCTION__); __func__);
netlink_unregister_notifier(&scsi_netlink_notifier); netlink_unregister_notifier(&scsi_netlink_notifier);
} }

4
drivers/scsi/scsi_proc.c
View File

@ -114,7 +114,7 @@ void scsi_proc_hostdir_add(struct scsi_host_template *sht)
sht->proc_dir = proc_mkdir(sht->proc_name, proc_scsi); sht->proc_dir = proc_mkdir(sht->proc_name, proc_scsi);
if (!sht->proc_dir) if (!sht->proc_dir)
printk(KERN_ERR "%s: proc_mkdir failed for %s\n", printk(KERN_ERR "%s: proc_mkdir failed for %s\n",
__FUNCTION__, sht->proc_name); __func__, sht->proc_name);
else else
sht->proc_dir->owner = sht->module; sht->proc_dir->owner = sht->module;
} }
@ -157,7 +157,7 @@ void scsi_proc_host_add(struct Scsi_Host *shost)
sht->proc_dir, proc_scsi_read, shost); sht->proc_dir, proc_scsi_read, shost);
if (!p) { if (!p) {
printk(KERN_ERR "%s: Failed to register host %d in" printk(KERN_ERR "%s: Failed to register host %d in"
"%s\n", __FUNCTION__, shost->host_no, "%s\n", __func__, shost->host_no,
sht->proc_name); sht->proc_name);
return; return;
} }

12
drivers/scsi/scsi_scan.c
View File

@ -318,7 +318,7 @@ out_device_destroy:
put_device(&sdev->sdev_gendev); put_device(&sdev->sdev_gendev);
out: out:
if (display_failure_msg) if (display_failure_msg)
printk(ALLOC_FAILURE_MSG, __FUNCTION__); printk(ALLOC_FAILURE_MSG, __func__);
return NULL; return NULL;
} }
@ -404,7 +404,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
starget = kzalloc(size, GFP_KERNEL); starget = kzalloc(size, GFP_KERNEL);
if (!starget) { if (!starget) {
printk(KERN_ERR "%s: allocation failure\n", __FUNCTION__); printk(KERN_ERR "%s: allocation failure\n", __func__);
return NULL; return NULL;
} }
dev = &starget->dev; dev = &starget->dev;
@ -1337,7 +1337,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
lun_data = kmalloc(length, GFP_ATOMIC | lun_data = kmalloc(length, GFP_ATOMIC |
(sdev->host->unchecked_isa_dma ? __GFP_DMA : 0)); (sdev->host->unchecked_isa_dma ? __GFP_DMA : 0));
if (!lun_data) { if (!lun_data) {
printk(ALLOC_FAILURE_MSG, __FUNCTION__); printk(ALLOC_FAILURE_MSG, __func__);
goto out; goto out;
} }
@ -1649,7 +1649,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
{ {
SCSI_LOG_SCAN_BUS(3, shost_printk (KERN_INFO, shost, SCSI_LOG_SCAN_BUS(3, shost_printk (KERN_INFO, shost,
"%s: <%u:%u:%u>\n", "%s: <%u:%u:%u>\n",
__FUNCTION__, channel, id, lun)); __func__, channel, id, lun));
if (((channel != SCAN_WILD_CARD) && (channel > shost->max_channel)) || if (((channel != SCAN_WILD_CARD) && (channel > shost->max_channel)) ||
((id != SCAN_WILD_CARD) && (id >= shost->max_id)) || ((id != SCAN_WILD_CARD) && (id >= shost->max_id)) ||
@ -1703,7 +1703,7 @@ static struct async_scan_data *scsi_prep_async_scan(struct Scsi_Host *shost)
return NULL; return NULL;
if (shost->async_scan) { if (shost->async_scan) {
printk("%s called twice for host %d", __FUNCTION__, printk("%s called twice for host %d", __func__,
shost->host_no); shost->host_no);
dump_stack(); dump_stack();
return NULL; return NULL;
@ -1757,7 +1757,7 @@ static void scsi_finish_async_scan(struct async_scan_data *data)
mutex_lock(&shost->scan_mutex); mutex_lock(&shost->scan_mutex);
if (!shost->async_scan) { if (!shost->async_scan) {
printk("%s called twice for host %d", __FUNCTION__, printk("%s called twice for host %d", __func__,
shost->host_no); shost->host_no);
dump_stack(); dump_stack();
mutex_unlock(&shost->scan_mutex); mutex_unlock(&shost->scan_mutex);

2
drivers/scsi/scsi_tgt_priv.h
View File

@ -6,7 +6,7 @@ struct task_struct;
/* tmp - will replace with SCSI logging stuff */ /* tmp - will replace with SCSI logging stuff */
#define eprintk(fmt, args...) \ #define eprintk(fmt, args...) \
do { \ do { \
printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \ printk("%s(%d) " fmt, __func__, __LINE__, ##args); \
} while (0) } while (0)
#define dprintk(fmt, args...) #define dprintk(fmt, args...)

12
drivers/scsi/scsi_transport_fc.c
View File

@ -571,7 +571,7 @@ send_fail:
name = get_fc_host_event_code_name(event_code); name = get_fc_host_event_code_name(event_code);
printk(KERN_WARNING printk(KERN_WARNING
"%s: Dropped Event : host %d %s data 0x%08x - err %d\n", "%s: Dropped Event : host %d %s data 0x%08x - err %d\n",
__FUNCTION__, shost->host_no, __func__, shost->host_no,
(name) ? name : "<unknown>", event_data, err); (name) ? name : "<unknown>", event_data, err);
return; return;
} }
@ -644,7 +644,7 @@ send_vendor_fail_skb:
send_vendor_fail: send_vendor_fail:
printk(KERN_WARNING printk(KERN_WARNING
"%s: Dropped Event : host %d vendor_unique - err %d\n", "%s: Dropped Event : host %d vendor_unique - err %d\n",
__FUNCTION__, shost->host_no, err); __func__, shost->host_no, err);
return; return;
} }
EXPORT_SYMBOL(fc_host_post_vendor_event); EXPORT_SYMBOL(fc_host_post_vendor_event);
@ -2464,7 +2464,7 @@ fc_rport_create(struct Scsi_Host *shost, int channel,
size = (sizeof(struct fc_rport) + fci->f->dd_fcrport_size); size = (sizeof(struct fc_rport) + fci->f->dd_fcrport_size);
rport = kzalloc(size, GFP_KERNEL); rport = kzalloc(size, GFP_KERNEL);
if (unlikely(!rport)) { if (unlikely(!rport)) {
printk(KERN_ERR "%s: allocation failure\n", __FUNCTION__); printk(KERN_ERR "%s: allocation failure\n", __func__);
return NULL; return NULL;
} }
@ -3137,7 +3137,7 @@ fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev,
size = (sizeof(struct fc_vport) + fci->f->dd_fcvport_size); size = (sizeof(struct fc_vport) + fci->f->dd_fcvport_size);
vport = kzalloc(size, GFP_KERNEL); vport = kzalloc(size, GFP_KERNEL);
if (unlikely(!vport)) { if (unlikely(!vport)) {
printk(KERN_ERR "%s: allocation failure\n", __FUNCTION__); printk(KERN_ERR "%s: allocation failure\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
@ -3201,7 +3201,7 @@ fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev,
printk(KERN_ERR printk(KERN_ERR
"%s: Cannot create vport symlinks for " "%s: Cannot create vport symlinks for "
"%s, err=%d\n", "%s, err=%d\n",
__FUNCTION__, dev->bus_id, error); __func__, dev->bus_id, error);
} }
spin_lock_irqsave(shost->host_lock, flags); spin_lock_irqsave(shost->host_lock, flags);
vport->flags &= ~FC_VPORT_CREATING; vport->flags &= ~FC_VPORT_CREATING;
@ -3314,7 +3314,7 @@ fc_vport_sched_delete(struct work_struct *work)
if (stat) if (stat)
dev_printk(KERN_ERR, vport->dev.parent, dev_printk(KERN_ERR, vport->dev.parent,
"%s: %s could not be deleted created via " "%s: %s could not be deleted created via "
"shost%d channel %d - error %d\n", __FUNCTION__, "shost%d channel %d - error %d\n", __func__,
vport->dev.bus_id, vport->shost->host_no, vport->dev.bus_id, vport->shost->host_no,
vport->channel, stat); vport->channel, stat);
} }

4
drivers/scsi/scsi_transport_sas.c
View File

@ -779,7 +779,7 @@ static void sas_port_create_link(struct sas_port *port,
return; return;
err: err:
printk(KERN_ERR "%s: Cannot create port links, err=%d\n", printk(KERN_ERR "%s: Cannot create port links, err=%d\n",
__FUNCTION__, res); __func__, res);
} }
static void sas_port_delete_link(struct sas_port *port, static void sas_port_delete_link(struct sas_port *port,
@ -1029,7 +1029,7 @@ void sas_port_mark_backlink(struct sas_port *port)
return; return;
err: err:
printk(KERN_ERR "%s: Cannot create port backlink, err=%d\n", printk(KERN_ERR "%s: Cannot create port backlink, err=%d\n",
__FUNCTION__, res); __func__, res);
} }
EXPORT_SYMBOL(sas_port_mark_backlink); EXPORT_SYMBOL(sas_port_mark_backlink);

8
drivers/scsi/tmscsim.c
View File

@ -452,7 +452,7 @@ static int dc390_pci_map (struct dc390_srb* pSRB)
/* TODO: error handling */ /* TODO: error handling */
if (pSRB->SGcount != 1) if (pSRB->SGcount != 1)
error = 1; error = 1;
DEBUG1(printk("%s(): Mapped sense buffer %p at %x\n", __FUNCTION__, pcmd->sense_buffer, cmdp->saved_dma_handle)); DEBUG1(printk("%s(): Mapped sense buffer %p at %x\n", __func__, pcmd->sense_buffer, cmdp->saved_dma_handle));
/* Map SG list */ /* Map SG list */
} else if (scsi_sg_count(pcmd)) { } else if (scsi_sg_count(pcmd)) {
int nseg; int nseg;
@ -466,7 +466,7 @@ static int dc390_pci_map (struct dc390_srb* pSRB)
if (nseg < 0) if (nseg < 0)
error = 1; error = 1;
DEBUG1(printk("%s(): Mapped SG %p with %d (%d) elements\n",\ DEBUG1(printk("%s(): Mapped SG %p with %d (%d) elements\n",\
__FUNCTION__, scsi_sglist(pcmd), nseg, scsi_sg_count(pcmd))); __func__, scsi_sglist(pcmd), nseg, scsi_sg_count(pcmd)));
/* Map single segment */ /* Map single segment */
} else } else
pSRB->SGcount = 0; pSRB->SGcount = 0;
@ -483,11 +483,11 @@ static void dc390_pci_unmap (struct dc390_srb* pSRB)
if (pSRB->SRBFlag) { if (pSRB->SRBFlag) {
pci_unmap_sg(pdev, &pSRB->Segmentx, 1, DMA_FROM_DEVICE); pci_unmap_sg(pdev, &pSRB->Segmentx, 1, DMA_FROM_DEVICE);
DEBUG1(printk("%s(): Unmapped sense buffer at %x\n", __FUNCTION__, cmdp->saved_dma_handle)); DEBUG1(printk("%s(): Unmapped sense buffer at %x\n", __func__, cmdp->saved_dma_handle));
} else { } else {
scsi_dma_unmap(pcmd); scsi_dma_unmap(pcmd);
DEBUG1(printk("%s(): Unmapped SG at %p with %d elements\n", DEBUG1(printk("%s(): Unmapped SG at %p with %d elements\n",
__FUNCTION__, scsi_sglist(pcmd), scsi_sg_count(pcmd))); __func__, scsi_sglist(pcmd), scsi_sg_count(pcmd)));
} }
} }

8
drivers/scsi/wd7000.c
View File

@ -148,7 +148,7 @@
* *
* 2002/10/04 - Alan Cox <alan@redhat.com> * 2002/10/04 - Alan Cox <alan@redhat.com>
* *
* Use dev_id for interrupts, kill __FUNCTION__ pasting * Use dev_id for interrupts, kill __func__ pasting
* Add a lock for the scb pool, clean up all other cli/sti usage stuff * Add a lock for the scb pool, clean up all other cli/sti usage stuff
* Use the adapter lock for the other places we had the cli's * Use the adapter lock for the other places we had the cli's
* *
@ -640,12 +640,12 @@ static int __init wd7000_setup(char *str)
(void) get_options(str, ARRAY_SIZE(ints), ints); (void) get_options(str, ARRAY_SIZE(ints), ints);
if (wd7000_card_num >= NUM_CONFIGS) { if (wd7000_card_num >= NUM_CONFIGS) {
printk(KERN_ERR "%s: Too many \"wd7000=\" configurations in " "command line!\n", __FUNCTION__); printk(KERN_ERR "%s: Too many \"wd7000=\" configurations in " "command line!\n", __func__);
return 0; return 0;
} }
if ((ints[0] < 3) || (ints[0] > 5)) { if ((ints[0] < 3) || (ints[0] > 5)) {
printk(KERN_ERR "%s: Error in command line! " "Usage: wd7000=<IRQ>,<DMA>,IO>[,<BUS_ON>" "[,<BUS_OFF>]]\n", __FUNCTION__); printk(KERN_ERR "%s: Error in command line! " "Usage: wd7000=<IRQ>,<DMA>,IO>[,<BUS_ON>" "[,<BUS_OFF>]]\n", __func__);
} else { } else {
for (i = 0; i < NUM_IRQS; i++) for (i = 0; i < NUM_IRQS; i++)
if (ints[1] == wd7000_irq[i]) if (ints[1] == wd7000_irq[i])
@ -1642,7 +1642,7 @@ static int wd7000_biosparam(struct scsi_device *sdev,
ip[2] = info[2]; ip[2] = info[2];
if (info[0] == 255) if (info[0] == 255)
printk(KERN_INFO "%s: current partition table is " "using extended translation.\n", __FUNCTION__); printk(KERN_INFO "%s: current partition table is " "using extended translation.\n", __func__);
} }
} }

8
drivers/scsi/zalon.c
View File

@ -68,11 +68,11 @@ lasi_scsi_clock(void * hpa, int defaultclock)
if (status == PDC_RET_OK) { if (status == PDC_RET_OK) {
clock = (int) pdc_result[16]; clock = (int) pdc_result[16];
} else { } else {
printk(KERN_WARNING "%s: pdc_iodc_read returned %d\n", __FUNCTION__, status); printk(KERN_WARNING "%s: pdc_iodc_read returned %d\n", __func__, status);
clock = defaultclock; clock = defaultclock;
} }
printk(KERN_DEBUG "%s: SCSI clock %d\n", __FUNCTION__, clock); printk(KERN_DEBUG "%s: SCSI clock %d\n", __func__, clock);
return clock; return clock;
} }
#endif #endif
@ -108,13 +108,13 @@ zalon_probe(struct parisc_device *dev)
*/ */
dev->irq = gsc_alloc_irq(&gsc_irq); dev->irq = gsc_alloc_irq(&gsc_irq);
printk(KERN_INFO "%s: Zalon version %d, IRQ %d\n", __FUNCTION__, printk(KERN_INFO "%s: Zalon version %d, IRQ %d\n", __func__,
zalon_vers, dev->irq); zalon_vers, dev->irq);
__raw_writel(gsc_irq.txn_addr | gsc_irq.txn_data, zalon + IO_MODULE_EIM); __raw_writel(gsc_irq.txn_addr | gsc_irq.txn_data, zalon + IO_MODULE_EIM);
if (zalon_vers == 0) if (zalon_vers == 0)
printk(KERN_WARNING "%s: Zalon 1.1 or earlier\n", __FUNCTION__); printk(KERN_WARNING "%s: Zalon 1.1 or earlier\n", __func__);
memset(&device, 0, sizeof(struct ncr_device)); memset(&device, 0, sizeof(struct ncr_device));