Skip to content

L
linux
Commit eff074da authored by David S. Miller's avatar David S. Miller
Browse files
Options

[IRDA]: Fix 64-bit warnings. 

1) Use proper size_t printf format specifier
2) Cast pointers properly when passing them to hashfind
3) Print pointers using proper printf format specifier
   instead of using ugly casts.
parent 850b9a8f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 75 deletions
net/irda/irda_device.c
View file @ eff074da
...@@ -231,7 +231,7 @@ static void __irda_task_delete(struct irda_task *task) ...@@ -231,7 +231,7 @@ static void __irda_task_delete(struct irda_task *task)
void irda_task_delete(struct irda_task *task) void irda_task_delete(struct irda_task *task)
{ {
/* Unregister task */ /* Unregister task */
hashbin_remove(tasks, (int) task, NULL); hashbin_remove(tasks, (long) task, NULL);
__irda_task_delete(task); __irda_task_delete(task);
} }
...@@ -345,7 +345,7 @@ struct irda_task *irda_task_execute(void *instance, ...@@ -345,7 +345,7 @@ struct irda_task *irda_task_execute(void *instance,
init_timer(&task->timer); init_timer(&task->timer);
/* Register task */ /* Register task */
hashbin_insert(tasks, (irda_queue_t *) task, (int) task, NULL); hashbin_insert(tasks, (irda_queue_t *) task, (long) task, NULL);
/* No time to waste, so lets get going! */ /* No time to waste, so lets get going! */
ret = irda_task_kick(task); ret = irda_task_kick(task);
......
net/irda/irnet/irnet_irda.c
View file @ eff074da
This diff is collapsed.
net/irda/irnet/irnet_ppp.c
View file @ eff074da
...@@ -43,7 +43,7 @@ irnet_ctrl_write(irnet_socket * ap, ...@@ -43,7 +43,7 @@ irnet_ctrl_write(irnet_socket * ap,
char * next; /* Next command to process */ char * next; /* Next command to process */
int length; /* Length of current command */ int length; /* Length of current command */
DENTER(CTRL_TRACE, "(ap=0x%X, count=%d)\n", (unsigned int) ap, count); DENTER(CTRL_TRACE, "(ap=0x%p, count=%Zd)\n", ap, count);
/* Check for overflow... */ /* Check for overflow... */
DABORT(count >= IRNET_MAX_COMMAND, -ENOMEM, DABORT(count >= IRNET_MAX_COMMAND, -ENOMEM,
...@@ -58,7 +58,7 @@ irnet_ctrl_write(irnet_socket * ap, ...@@ -58,7 +58,7 @@ irnet_ctrl_write(irnet_socket * ap,
/* Safe terminate the string */ /* Safe terminate the string */
command[count] = '\0'; command[count] = '\0';
DEBUG(CTRL_INFO, "Command line received is ``%s'' (%d).\n", DEBUG(CTRL_INFO, "Command line received is ``%s'' (%Zd).\n",
command, count); command, count);
/* Check every commands in the command line */ /* Check every commands in the command line */
...@@ -184,8 +184,8 @@ irnet_read_discovery_log(irnet_socket * ap, ...@@ -184,8 +184,8 @@ irnet_read_discovery_log(irnet_socket * ap,
{ {
int done_event = 0; int done_event = 0;
DENTER(CTRL_TRACE, "(ap=0x%X, event=0x%X)\n", DENTER(CTRL_TRACE, "(ap=0x%p, event=0x%p)\n",
(unsigned int) ap, (unsigned int) event); ap, event);
/* Test if we have some work to do or we have already finished */ /* Test if we have some work to do or we have already finished */
if(ap->disco_number == -1) if(ap->disco_number == -1)
...@@ -205,8 +205,8 @@ irnet_read_discovery_log(irnet_socket * ap, ...@@ -205,8 +205,8 @@ irnet_read_discovery_log(irnet_socket * ap,
/* Check if the we got some results */ /* Check if the we got some results */
if(ap->discoveries == NULL) if(ap->discoveries == NULL)
ap->disco_number = -1; ap->disco_number = -1;
DEBUG(CTRL_INFO, "Got the log (0x%X), size is %d\n", DEBUG(CTRL_INFO, "Got the log (0x%p), size is %d\n",
(unsigned int) ap->discoveries, ap->disco_number); ap->discoveries, ap->disco_number);
} }
/* Check if we have more item to dump */ /* Check if we have more item to dump */
...@@ -232,8 +232,8 @@ irnet_read_discovery_log(irnet_socket * ap, ...@@ -232,8 +232,8 @@ irnet_read_discovery_log(irnet_socket * ap,
if(ap->disco_index >= ap->disco_number) if(ap->disco_index >= ap->disco_number)
{ {
/* No more items : remove the log and signal termination */ /* No more items : remove the log and signal termination */
DEBUG(CTRL_INFO, "Cleaning up log (0x%X)\n", DEBUG(CTRL_INFO, "Cleaning up log (0x%p)\n",
(unsigned int) ap->discoveries); ap->discoveries);
if(ap->discoveries != NULL) if(ap->discoveries != NULL)
{ {
/* Cleanup our copy of the discovery log */ /* Cleanup our copy of the discovery log */
...@@ -261,7 +261,7 @@ irnet_ctrl_read(irnet_socket * ap, ...@@ -261,7 +261,7 @@ irnet_ctrl_read(irnet_socket * ap,
char event[64]; /* Max event is 61 char */ char event[64]; /* Max event is 61 char */
ssize_t ret = 0; ssize_t ret = 0;
DENTER(CTRL_TRACE, "(ap=0x%X, count=%d)\n", (unsigned int) ap, count); DENTER(CTRL_TRACE, "(ap=0x%p, count=%Zd)\n", ap, count);
/* Check if we can write an event out in one go */ /* Check if we can write an event out in one go */
DABORT(count < sizeof(event), -EOVERFLOW, CTRL_ERROR, "Buffer to small.\n"); DABORT(count < sizeof(event), -EOVERFLOW, CTRL_ERROR, "Buffer to small.\n");
...@@ -307,7 +307,7 @@ irnet_ctrl_read(irnet_socket * ap, ...@@ -307,7 +307,7 @@ irnet_ctrl_read(irnet_socket * ap,
if(ret != 0) if(ret != 0)
{ {
/* No, return the error code */ /* No, return the error code */
DEXIT(CTRL_TRACE, " - ret %d\n", ret); DEXIT(CTRL_TRACE, " - ret %Zd\n", ret);
return ret; return ret;
} }
...@@ -402,7 +402,7 @@ irnet_ctrl_poll(irnet_socket * ap, ...@@ -402,7 +402,7 @@ irnet_ctrl_poll(irnet_socket * ap,
{ {
unsigned int mask; unsigned int mask;
DENTER(CTRL_TRACE, "(ap=0x%X)\n", (unsigned int) ap); DENTER(CTRL_TRACE, "(ap=0x%p)\n", ap);
poll_wait(file, &irnet_events.rwait, wait); poll_wait(file, &irnet_events.rwait, wait);
mask = POLLOUT | POLLWRNORM; mask = POLLOUT | POLLWRNORM;
...@@ -439,7 +439,7 @@ dev_irnet_open(struct inode * inode, ...@@ -439,7 +439,7 @@ dev_irnet_open(struct inode * inode,
struct irnet_socket * ap; struct irnet_socket * ap;
int err; int err;
DENTER(FS_TRACE, "(file=0x%X)\n", (unsigned int) file); DENTER(FS_TRACE, "(file=0x%p)\n", file);
#ifdef SECURE_DEVIRNET #ifdef SECURE_DEVIRNET
/* This could (should?) be enforced by the permissions on /dev/irnet. */ /* This could (should?) be enforced by the permissions on /dev/irnet. */
...@@ -482,7 +482,7 @@ dev_irnet_open(struct inode * inode, ...@@ -482,7 +482,7 @@ dev_irnet_open(struct inode * inode,
/* Put our stuff where we will be able to find it later */ /* Put our stuff where we will be able to find it later */
file->private_data = ap; file->private_data = ap;
DEXIT(FS_TRACE, " - ap=0x%X\n", (unsigned int) ap); DEXIT(FS_TRACE, " - ap=0x%p\n", ap);
return 0; return 0;
} }
...@@ -498,8 +498,8 @@ dev_irnet_close(struct inode * inode, ...@@ -498,8 +498,8 @@ dev_irnet_close(struct inode * inode,
{ {
irnet_socket * ap = (struct irnet_socket *) file->private_data; irnet_socket * ap = (struct irnet_socket *) file->private_data;
DENTER(FS_TRACE, "(file=0x%X, ap=0x%X)\n", DENTER(FS_TRACE, "(file=0x%p, ap=0x%p)\n",
(unsigned int) file, (unsigned int) ap); file, ap);
DABORT(ap == NULL, 0, FS_ERROR, "ap is NULL !!!\n"); DABORT(ap == NULL, 0, FS_ERROR, "ap is NULL !!!\n");
/* Detach ourselves */ /* Detach ourselves */
...@@ -535,8 +535,8 @@ dev_irnet_write(struct file * file, ...@@ -535,8 +535,8 @@ dev_irnet_write(struct file * file,
{ {
irnet_socket * ap = (struct irnet_socket *) file->private_data; irnet_socket * ap = (struct irnet_socket *) file->private_data;
DPASS(FS_TRACE, "(file=0x%X, ap=0x%X, count=%d)\n", DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%Zd)\n",
(unsigned int) file, (unsigned int) ap, count); file, ap, count);
DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n"); DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n");
/* If we are connected to ppp_generic, let it handle the job */ /* If we are connected to ppp_generic, let it handle the job */
...@@ -559,8 +559,8 @@ dev_irnet_read(struct file * file, ...@@ -559,8 +559,8 @@ dev_irnet_read(struct file * file,
{ {
irnet_socket * ap = (struct irnet_socket *) file->private_data; irnet_socket * ap = (struct irnet_socket *) file->private_data;
DPASS(FS_TRACE, "(file=0x%X, ap=0x%X, count=%d)\n", DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%Zd)\n",
(unsigned int) file, (unsigned int) ap, count); file, ap, count);
DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n"); DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n");
/* If we are connected to ppp_generic, let it handle the job */ /* If we are connected to ppp_generic, let it handle the job */
...@@ -581,8 +581,8 @@ dev_irnet_poll(struct file * file, ...@@ -581,8 +581,8 @@ dev_irnet_poll(struct file * file,
irnet_socket * ap = (struct irnet_socket *) file->private_data; irnet_socket * ap = (struct irnet_socket *) file->private_data;
unsigned int mask; unsigned int mask;
DENTER(FS_TRACE, "(file=0x%X, ap=0x%X)\n", DENTER(FS_TRACE, "(file=0x%p, ap=0x%p)\n",
(unsigned int) file, (unsigned int) ap); file, ap);
mask = POLLOUT | POLLWRNORM; mask = POLLOUT | POLLWRNORM;
DABORT(ap == NULL, mask, FS_ERROR, "ap is NULL !!!\n"); DABORT(ap == NULL, mask, FS_ERROR, "ap is NULL !!!\n");
...@@ -611,8 +611,8 @@ dev_irnet_ioctl(struct inode * inode, ...@@ -611,8 +611,8 @@ dev_irnet_ioctl(struct inode * inode,
int err; int err;
int val; int val;
DENTER(FS_TRACE, "(file=0x%X, ap=0x%X, cmd=0x%X)\n", DENTER(FS_TRACE, "(file=0x%p, ap=0x%p, cmd=0x%X)\n",
(unsigned int) file, (unsigned int) ap, cmd); file, ap, cmd);
/* Basic checks... */ /* Basic checks... */
DASSERT(ap != NULL, -ENXIO, PPP_ERROR, "ap is NULL...\n"); DASSERT(ap != NULL, -ENXIO, PPP_ERROR, "ap is NULL...\n");
...@@ -777,8 +777,8 @@ irnet_prepare_skb(irnet_socket * ap, ...@@ -777,8 +777,8 @@ irnet_prepare_skb(irnet_socket * ap,
int islcp; /* Protocol == LCP */ int islcp; /* Protocol == LCP */
int needaddr; /* Need PPP address */ int needaddr; /* Need PPP address */
DENTER(PPP_TRACE, "(ap=0x%X, skb=0x%X)\n", DENTER(PPP_TRACE, "(ap=0x%p, skb=0x%p)\n",
(unsigned int) ap, (unsigned int) skb); ap, skb);
/* Extract PPP protocol from the frame */ /* Extract PPP protocol from the frame */
data = skb->data; data = skb->data;
...@@ -845,8 +845,8 @@ ppp_irnet_send(struct ppp_channel * chan, ...@@ -845,8 +845,8 @@ ppp_irnet_send(struct ppp_channel * chan,
irnet_socket * self = (struct irnet_socket *) chan->private; irnet_socket * self = (struct irnet_socket *) chan->private;
int ret; int ret;
DENTER(PPP_TRACE, "(channel=0x%X, ap/self=0x%X)\n", DENTER(PPP_TRACE, "(channel=0x%p, ap/self=0x%p)\n",
(unsigned int) chan, (unsigned int) self); chan, self);
/* Check if things are somewhat valid... */ /* Check if things are somewhat valid... */
DASSERT(self != NULL, 0, PPP_ERROR, "Self is NULL !!!\n"); DASSERT(self != NULL, 0, PPP_ERROR, "Self is NULL !!!\n");
...@@ -949,8 +949,8 @@ ppp_irnet_ioctl(struct ppp_channel * chan, ...@@ -949,8 +949,8 @@ ppp_irnet_ioctl(struct ppp_channel * chan,
int val; int val;
u32 accm[8]; u32 accm[8];
DENTER(PPP_TRACE, "(channel=0x%X, ap=0x%X, cmd=0x%X)\n", DENTER(PPP_TRACE, "(channel=0x%p, ap=0x%p, cmd=0x%X)\n",
(unsigned int) chan, (unsigned int) ap, cmd); chan, ap, cmd);
/* Basic checks... */ /* Basic checks... */
DASSERT(ap != NULL, -ENXIO, PPP_ERROR, "ap is NULL...\n"); DASSERT(ap != NULL, -ENXIO, PPP_ERROR, "ap is NULL...\n");
......
net/irda/irttp.c
View file @ eff074da
...@@ -1408,7 +1408,7 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance) ...@@ -1408,7 +1408,7 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance)
spin_lock_irqsave(&irttp->tsaps->hb_spinlock, flags); spin_lock_irqsave(&irttp->tsaps->hb_spinlock, flags);
/* Find the old instance */ /* Find the old instance */
if (!hashbin_find(irttp->tsaps, (int) orig, NULL)) { if (!hashbin_find(irttp->tsaps, (long) orig, NULL)) {
IRDA_DEBUG(0, "%s(), unable to find TSAP\n", __FUNCTION__); IRDA_DEBUG(0, "%s(), unable to find TSAP\n", __FUNCTION__);
spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags); spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags);
return NULL; return NULL;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7