* [PATCH] powerpc: cleanup from l64 to ll64 change: drivers/scsi
@ 2009-01-07 0:59 Stephen Rothwell
2009-01-12 16:01 ` Brian King
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-01-07 0:59 UTC (permalink / raw)
To: James E.J. Bottomley; +Cc: King, ppc-dev, linux-scsi, Brian
This is a powerpc specific driver.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/scsi/ibmvscsi/ibmvfc.c | 14 +++++++-------
drivers/scsi/ibmvscsi/ibmvfc.h | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
This patch on its own will generate several warnings - it depends on the
actual l64 to ll64 patch that is pending in the powerp queue. It may be
easier for someone to just ack this patch so that it can be fed through
the powerpc tree.
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 44f202f..be6cf09 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -933,7 +933,7 @@ static void ibmvfc_get_host_speed(struct Scsi_Host *shost)
fc_host_speed(shost) = FC_PORTSPEED_16GBIT;
break;
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);
fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;
break;
@@ -2149,8 +2149,8 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
{
const char *desc = ibmvfc_get_ae_desc(crq->event);
- ibmvfc_log(vhost, 3, "%s event received. scsi_id: %lx, wwpn: %lx,"
- " node_name: %lx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
+ ibmvfc_log(vhost, 3, "%s event received. scsi_id: %llx, wwpn: %llx,"
+ " node_name: %llx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
switch (crq->event) {
case IBMVFC_AE_LINK_UP:
@@ -2184,7 +2184,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
ibmvfc_link_down(vhost, IBMVFC_HALTED);
break;
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;
};
}
@@ -2261,13 +2261,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost)
* actually sent
*/
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);
return;
}
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);
return;
}
@@ -3259,7 +3259,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id)
tgt = mempool_alloc(vhost->tgt_pool, GFP_KERNEL);
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);
return -ENOMEM;
}
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index babdf3d..87dafd0 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -691,13 +691,13 @@ struct ibmvfc_host {
#define DBG_CMD(CMD) do { if (ibmvfc_debug) CMD; } while (0)
#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, ...) \
- 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, ...) \
- 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, ...) \
DBG_CMD(dev_info((vhost)->dev, ##__VA_ARGS__))
--
1.6.0.5
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] powerpc: cleanup from l64 to ll64 change: drivers/scsi
2009-01-07 0:59 [PATCH] powerpc: cleanup from l64 to ll64 change: drivers/scsi Stephen Rothwell
@ 2009-01-12 16:01 ` Brian King
0 siblings, 0 replies; 2+ messages in thread
From: Brian King @ 2009-01-12 16:01 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: James E.J. Bottomley, ppc-dev, linux-scsi
Acked by: Brian King <brking@linux.vnet.ibm.com>
Stephen Rothwell wrote:
> This is a powerpc specific driver.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/scsi/ibmvscsi/ibmvfc.c | 14 +++++++-------
> drivers/scsi/ibmvscsi/ibmvfc.h | 6 +++---
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> This patch on its own will generate several warnings - it depends on the
> actual l64 to ll64 patch that is pending in the powerp queue. It may be
> easier for someone to just ack this patch so that it can be fed through
> the powerpc tree.
>
> diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
> index 44f202f..be6cf09 100644
> --- a/drivers/scsi/ibmvscsi/ibmvfc.c
> +++ b/drivers/scsi/ibmvscsi/ibmvfc.c
> @@ -933,7 +933,7 @@ static void ibmvfc_get_host_speed(struct Scsi_Host *shost)
> fc_host_speed(shost) = FC_PORTSPEED_16GBIT;
> break;
> 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);
> fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;
> break;
> @@ -2149,8 +2149,8 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
> {
> const char *desc = ibmvfc_get_ae_desc(crq->event);
>
> - ibmvfc_log(vhost, 3, "%s event received. scsi_id: %lx, wwpn: %lx,"
> - " node_name: %lx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
> + ibmvfc_log(vhost, 3, "%s event received. scsi_id: %llx, wwpn: %llx,"
> + " node_name: %llx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
>
> switch (crq->event) {
> case IBMVFC_AE_LINK_UP:
> @@ -2184,7 +2184,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
> ibmvfc_link_down(vhost, IBMVFC_HALTED);
> break;
> 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;
> };
> }
> @@ -2261,13 +2261,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost)
> * actually sent
> */
> 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);
> return;
> }
>
> 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);
> return;
> }
> @@ -3259,7 +3259,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id)
>
> tgt = mempool_alloc(vhost->tgt_pool, GFP_KERNEL);
> 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);
> return -ENOMEM;
> }
> diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
> index babdf3d..87dafd0 100644
> --- a/drivers/scsi/ibmvscsi/ibmvfc.h
> +++ b/drivers/scsi/ibmvscsi/ibmvfc.h
> @@ -691,13 +691,13 @@ struct ibmvfc_host {
> #define DBG_CMD(CMD) do { if (ibmvfc_debug) CMD; } while (0)
>
> #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, ...) \
> - 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, ...) \
> - 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, ...) \
> DBG_CMD(dev_info((vhost)->dev, ##__VA_ARGS__))
--
Brian King
Linux on Power Virtualization
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-01-12 16:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-07 0:59 [PATCH] powerpc: cleanup from l64 to ll64 change: drivers/scsi Stephen Rothwell
2009-01-12 16:01 ` Brian King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).