From: "Randy.Dunlap" This patch removes warnings on non-matching parameter types to printk and incorrect function types (n_hdlc). drivers/atm/eni.c | 2 +- drivers/atm/firestream.c | 12 ++++++------ drivers/char/n_hdlc.c | 12 ++++++------ fs/freevxfs/vxfs_inode.c | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff -puN drivers/atm/eni.c~size_t-printk-warning-fixes drivers/atm/eni.c --- 25/drivers/atm/eni.c~size_t-printk-warning-fixes 2003-08-26 20:28:01.000000000 -0700 +++ 25-akpm/drivers/atm/eni.c 2003-08-26 20:28:01.000000000 -0700 @@ -2345,7 +2345,7 @@ static int __init eni_init(void) struct sk_buff *skb; /* dummy for sizeof */ if (sizeof(skb->cb) < sizeof(struct eni_skb_prv)) { - printk(KERN_ERR "eni_detect: skb->cb is too small (%d < %d)\n", + printk(KERN_ERR "eni_detect: skb->cb is too small (%Zd < %Zd)\n", sizeof(skb->cb),sizeof(struct eni_skb_prv)); return -EIO; } diff -puN drivers/atm/firestream.c~size_t-printk-warning-fixes drivers/atm/firestream.c --- 25/drivers/atm/firestream.c~size_t-printk-warning-fixes 2003-08-26 20:28:01.000000000 -0700 +++ 25-akpm/drivers/atm/firestream.c 2003-08-26 20:28:01.000000000 -0700 @@ -895,7 +895,7 @@ static int fs_open(struct atm_vcc *atm_v /* XXX handle qos parameters (rate limiting) ? */ vcc = kmalloc(sizeof(struct fs_vcc), GFP_KERNEL); - fs_dprintk (FS_DEBUG_ALLOC, "Alloc VCC: %p(%d)\n", vcc, sizeof(struct fs_vcc)); + fs_dprintk (FS_DEBUG_ALLOC, "Alloc VCC: %p(%Zd)\n", vcc, sizeof(struct fs_vcc)); if (!vcc) { clear_bit(ATM_VF_ADDR, &atm_vcc->flags); return -ENOMEM; @@ -946,7 +946,7 @@ static int fs_open(struct atm_vcc *atm_v if (DO_DIRECTION (txtp)) { tc = kmalloc (sizeof (struct fs_transmit_config), GFP_KERNEL); - fs_dprintk (FS_DEBUG_ALLOC, "Alloc tc: %p(%d)\n", + fs_dprintk (FS_DEBUG_ALLOC, "Alloc tc: %p(%Zd)\n", tc, sizeof (struct fs_transmit_config)); if (!tc) { fs_dprintk (FS_DEBUG_OPEN, "fs: can't alloc transmit_config.\n"); @@ -1180,7 +1180,7 @@ static int fs_send (struct atm_vcc *atm_ vcc->last_skb = skb; td = kmalloc (sizeof (struct FS_BPENTRY), GFP_ATOMIC); - fs_dprintk (FS_DEBUG_ALLOC, "Alloc transd: %p(%d)\n", td, sizeof (struct FS_BPENTRY)); + fs_dprintk (FS_DEBUG_ALLOC, "Alloc transd: %p(%Zd)\n", td, sizeof (struct FS_BPENTRY)); if (!td) { /* Oops out of mem */ return -ENOMEM; @@ -1487,7 +1487,7 @@ static void top_off_fp (struct fs_dev *d fs_dprintk (FS_DEBUG_ALLOC, "Alloc rec-skb: %p(%d)\n", skb, fp->bufsize); if (!skb) break; ne = kmalloc (sizeof (struct FS_BPENTRY), gfp_flags); - fs_dprintk (FS_DEBUG_ALLOC, "Alloc rec-d: %p(%d)\n", ne, sizeof (struct FS_BPENTRY)); + fs_dprintk (FS_DEBUG_ALLOC, "Alloc rec-d: %p(%Zd)\n", ne, sizeof (struct FS_BPENTRY)); if (!ne) { fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p\n", skb); dev_kfree_skb_any (skb); @@ -1792,7 +1792,7 @@ static int __init fs_init (struct fs_dev } dev->atm_vccs = kmalloc (dev->nchannels * sizeof (struct atm_vcc *), GFP_KERNEL); - fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%d)\n", + fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%Zd)\n", dev->atm_vccs, dev->nchannels * sizeof (struct atm_vcc *)); if (!dev->atm_vccs) { @@ -1900,7 +1900,7 @@ static int __init firestream_init_one (s goto err_out; fs_dev = kmalloc (sizeof (struct fs_dev), GFP_KERNEL); - fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%d)\n", + fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%Zd)\n", fs_dev, sizeof (struct fs_dev)); if (!fs_dev) goto err_out; diff -puN drivers/char/n_hdlc.c~size_t-printk-warning-fixes drivers/char/n_hdlc.c --- 25/drivers/char/n_hdlc.c~size_t-printk-warning-fixes 2003-08-26 20:28:01.000000000 -0700 +++ 25-akpm/drivers/char/n_hdlc.c 2003-08-26 20:28:01.000000000 -0700 @@ -182,9 +182,9 @@ static ssize_t maxframe = 4096; /* TTY callbacks */ -static int n_hdlc_tty_read(struct tty_struct *tty, struct file *file, +static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file, __u8 *buf, size_t nr); -static int n_hdlc_tty_write(struct tty_struct *tty, struct file *file, +static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file, const __u8 *buf, size_t nr); static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); @@ -572,7 +572,7 @@ static void n_hdlc_tty_receive(struct tt * * Returns the number of bytes returned or error code. */ -static int n_hdlc_tty_read(struct tty_struct *tty, struct file *file, +static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file, __u8 *buf, size_t nr) { struct n_hdlc *n_hdlc = tty2n_hdlc(tty); @@ -649,7 +649,7 @@ static int n_hdlc_tty_read(struct tty_st * * Returns the number of bytes written (or error code). */ -static int n_hdlc_tty_write(struct tty_struct *tty, struct file *file, +static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file, const __u8 *data, size_t count) { struct n_hdlc *n_hdlc = tty2n_hdlc (tty); @@ -658,7 +658,7 @@ static int n_hdlc_tty_write(struct tty_s struct n_hdlc_buf *tbuf; if (debuglevel >= DEBUG_LEVEL_INFO) - printk("%s(%d)n_hdlc_tty_write() called count=%d\n", + printk("%s(%d)n_hdlc_tty_write() called count=%Zd\n", __FILE__,__LINE__,count); /* Verify pointers */ @@ -673,7 +673,7 @@ static int n_hdlc_tty_write(struct tty_s if (debuglevel & DEBUG_LEVEL_INFO) printk (KERN_WARNING "n_hdlc_tty_write: truncating user packet " - "from %lu to %d\n", (unsigned long) count, + "from %lu to %Zd\n", (unsigned long) count, maxframe ); count = maxframe; } diff -puN fs/freevxfs/vxfs_inode.c~size_t-printk-warning-fixes fs/freevxfs/vxfs_inode.c --- 25/fs/freevxfs/vxfs_inode.c~size_t-printk-warning-fixes 2003-08-26 20:28:01.000000000 -0700 +++ 25-akpm/fs/freevxfs/vxfs_inode.c 2003-08-26 20:28:01.000000000 -0700 @@ -171,7 +171,7 @@ __vxfs_iget(ino_t ino, struct inode *ili return NULL; fail: - printk(KERN_WARNING "vxfs: unable to read inode %ld\n", ino); + printk(KERN_WARNING "vxfs: unable to read inode %ld\n", (unsigned long)ino); vxfs_put_page(pp); return NULL; } _