Commit 0968e60c authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[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.
parent 02343cfd
...@@ -228,7 +228,7 @@ static int bpck6_init_proto(PIA *pi) ...@@ -228,7 +228,7 @@ static int bpck6_init_proto(PIA *pi)
if (p) { if (p) {
memset(p, 0, sizeof(PPC)); memset(p, 0, sizeof(PPC));
pi->private = (int)p; pi->private = (unsigned long)p;
return 0; return 0;
} }
......
...@@ -261,7 +261,7 @@ static int frpw_test_proto( PIA *pi, char * scratch, int verbose ) ...@@ -261,7 +261,7 @@ static int frpw_test_proto( PIA *pi, char * scratch, int verbose )
frpw_disconnect(pi); frpw_disconnect(pi);
if (verbose) { 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); pi->device,pi->port,(pi->private%2),pi->mode,e[0],e[1],r);
} }
......
...@@ -45,7 +45,7 @@ struct pi_adapter { ...@@ -45,7 +45,7 @@ struct pi_adapter {
int saved_r0; /* saved port state */ int saved_r0; /* saved port state */
int saved_r2; /* saved port state */ int saved_r2; /* saved port state */
int reserved; /* number of ports reserved */ 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 */ wait_queue_head_t parq; /* semaphore for parport sharing */
void *pardev; /* pointer to pardevice */ void *pardev; /* pointer to pardevice */
......
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