From 0968e60c8f8c50c3d6ed7b995ded1b4f174a7f09 Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Wed, 4 Feb 2004 17:32:24 -0800 Subject: [PATCH] [PATCH] paride cleanup and fixes (25/25) paride has a ->private field for use by low-level drivers. It's not 64bit-clean - it's int, but is used to store a pointer (bpck6). Fix: replace with unsigned long, update typecasts in users. --- drivers/block/paride/bpck6.c | 2 +- drivers/block/paride/frpw.c | 2 +- drivers/block/paride/paride.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/paride/bpck6.c b/drivers/block/paride/bpck6.c index ff1e7449f401b..71646dba6791e 100644 --- a/drivers/block/paride/bpck6.c +++ b/drivers/block/paride/bpck6.c @@ -228,7 +228,7 @@ static int bpck6_init_proto(PIA *pi) if (p) { memset(p, 0, sizeof(PPC)); - pi->private = (int)p; + pi->private = (unsigned long)p; return 0; } diff --git a/drivers/block/paride/frpw.c b/drivers/block/paride/frpw.c index 313ec4708346f..56b3824b1538f 100644 --- a/drivers/block/paride/frpw.c +++ b/drivers/block/paride/frpw.c @@ -261,7 +261,7 @@ static int frpw_test_proto( PIA *pi, char * scratch, int verbose ) frpw_disconnect(pi); if (verbose) { - printk("%s: frpw: port 0x%x, chip %d, mode %d, test=(%d,%d,%d)\n", + printk("%s: frpw: port 0x%x, chip %ld, mode %d, test=(%d,%d,%d)\n", pi->device,pi->port,(pi->private%2),pi->mode,e[0],e[1],r); } diff --git a/drivers/block/paride/paride.h b/drivers/block/paride/paride.h index bbc8977167d19..46bd0a47ff7a7 100644 --- a/drivers/block/paride/paride.h +++ b/drivers/block/paride/paride.h @@ -45,7 +45,7 @@ struct pi_adapter { int saved_r0; /* saved port state */ int saved_r2; /* saved port state */ int reserved; /* number of ports reserved */ - int private; /* for protocol module */ + unsigned long private; /* for protocol module */ wait_queue_head_t parq; /* semaphore for parport sharing */ void *pardev; /* pointer to pardevice */ -- 2.53.0