Commit 775a42ec authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Benjamin Herrenschmidt

powerpc: Cleanup from l64 to ll64 change drivers/scsi

This is a powerpc specific driver.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 7cb36b6c
...@@ -933,7 +933,7 @@ static void ibmvfc_get_host_speed(struct Scsi_Host *shost) ...@@ -933,7 +933,7 @@ static void ibmvfc_get_host_speed(struct Scsi_Host *shost)
fc_host_speed(shost) = FC_PORTSPEED_16GBIT; fc_host_speed(shost) = FC_PORTSPEED_16GBIT;
break; break;
default: default:
ibmvfc_log(vhost, 3, "Unknown port speed: %ld Gbit\n", ibmvfc_log(vhost, 3, "Unknown port speed: %lld Gbit\n",
vhost->login_buf->resp.link_speed / 100); vhost->login_buf->resp.link_speed / 100);
fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN; fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;
break; break;
...@@ -2149,8 +2149,8 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq, ...@@ -2149,8 +2149,8 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
{ {
const char *desc = ibmvfc_get_ae_desc(crq->event); const char *desc = ibmvfc_get_ae_desc(crq->event);
ibmvfc_log(vhost, 3, "%s event received. scsi_id: %lx, wwpn: %lx," ibmvfc_log(vhost, 3, "%s event received. scsi_id: %llx, wwpn: %llx,"
" node_name: %lx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name); " node_name: %llx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
switch (crq->event) { switch (crq->event) {
case IBMVFC_AE_LINK_UP: case IBMVFC_AE_LINK_UP:
...@@ -2184,7 +2184,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq, ...@@ -2184,7 +2184,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
ibmvfc_link_down(vhost, IBMVFC_HALTED); ibmvfc_link_down(vhost, IBMVFC_HALTED);
break; break;
default: default:
dev_err(vhost->dev, "Unknown async event received: %ld\n", crq->event); dev_err(vhost->dev, "Unknown async event received: %lld\n", crq->event);
break; break;
}; };
} }
...@@ -2261,13 +2261,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost) ...@@ -2261,13 +2261,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost)
* actually sent * actually sent
*/ */
if (unlikely(!ibmvfc_valid_event(&vhost->pool, evt))) { if (unlikely(!ibmvfc_valid_event(&vhost->pool, evt))) {
dev_err(vhost->dev, "Returned correlation_token 0x%08lx is invalid!\n", dev_err(vhost->dev, "Returned correlation_token 0x%08llx is invalid!\n",
crq->ioba); crq->ioba);
return; return;
} }
if (unlikely(atomic_read(&evt->free))) { if (unlikely(atomic_read(&evt->free))) {
dev_err(vhost->dev, "Received duplicate correlation_token 0x%08lx!\n", dev_err(vhost->dev, "Received duplicate correlation_token 0x%08llx!\n",
crq->ioba); crq->ioba);
return; return;
} }
...@@ -3259,7 +3259,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id) ...@@ -3259,7 +3259,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id)
tgt = mempool_alloc(vhost->tgt_pool, GFP_KERNEL); tgt = mempool_alloc(vhost->tgt_pool, GFP_KERNEL);
if (!tgt) { if (!tgt) {
dev_err(vhost->dev, "Target allocation failure for scsi id %08lx\n", dev_err(vhost->dev, "Target allocation failure for scsi id %08llx\n",
scsi_id); scsi_id);
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -691,13 +691,13 @@ struct ibmvfc_host { ...@@ -691,13 +691,13 @@ struct ibmvfc_host {
#define DBG_CMD(CMD) do { if (ibmvfc_debug) CMD; } while (0) #define DBG_CMD(CMD) do { if (ibmvfc_debug) CMD; } while (0)
#define tgt_dbg(t, fmt, ...) \ #define tgt_dbg(t, fmt, ...) \
DBG_CMD(dev_info((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__)) DBG_CMD(dev_info((t)->vhost->dev, "%llX: " fmt, (t)->scsi_id, ##__VA_ARGS__))
#define tgt_info(t, fmt, ...) \ #define tgt_info(t, fmt, ...) \
dev_info((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__) dev_info((t)->vhost->dev, "%llX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
#define tgt_err(t, fmt, ...) \ #define tgt_err(t, fmt, ...) \
dev_err((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__) dev_err((t)->vhost->dev, "%llX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
#define ibmvfc_dbg(vhost, ...) \ #define ibmvfc_dbg(vhost, ...) \
DBG_CMD(dev_info((vhost)->dev, ##__VA_ARGS__)) DBG_CMD(dev_info((vhost)->dev, ##__VA_ARGS__))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment