[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.

diff --git a/drivers/block/paride/bpck6.c b/drivers/block/paride/bpck6.c
index ff1e7449f401b2c20beff93e10b6ee26e87ec6dd..71646dba6791e7d783815dd9967ffc10e1a42c83 100644 (file)
--- 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 313ec4708346fa428bc1e5bb533cc83c88a32a7f..56b3824b1538f122990af22a82f5718728b72e00 100644 (file)
--- 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 bbc8977167d19c790c4635c555929784e9a4c15a..46bd0a47ff7a7b7aefdd08da691f76b05b35f8ec 100644 (file)
--- 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 */