[PATCH] remove size_t-based printk warnings

From: "Randy.Dunlap" <rddunlap@osdl.org>

This patch removes warnings on non-matching parameter types to printk
and incorrect function types (n_hdlc).

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index c113f6e1c054b1eb69d00d8395c3193184b8dd0c..f6d081a52df1608677def113c41fd841fdeeb427 100644 (file)
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -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 --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 54b054e60932abc24e185c37d62ae3a1265a9037..2a78d565ebd7b54abbae8201a0de168a2cabb218 100644 (file)
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -895,7 +895,7 @@ static int fs_open(struct atm_vcc *atm_vcc, short vpi, int vci)
        /* 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_vcc, short vpi, int vci)
 
        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, struct sk_buff *skb)
        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 *dev, struct freepool *fp, int gfp_flags)
                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)
        }
        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 (struct pci_dev *pci_dev,
                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 --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index ac9af7c3e7dcee19c617009ce4a8d89b962a83a3..8ff16b5d21ac8d714297a1db77b709fc49392dc2 100644 (file)
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -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 tty_struct *tty, const __u8 *data,
  *     
  * 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_struct *tty, struct file *file,
  *             
  * 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_struct *tty, struct file *file,
        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_struct *tty, struct file *file,
                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 --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c
index 455dd66c5b094d38ad2e81afec2aac9e5df8556f..06d7fe84a4215d71b9ed0207f46c622ae2ecbb0b 100644 (file)
--- a/fs/freevxfs/vxfs_inode.c
+++ b/fs/freevxfs/vxfs_inode.c
@@ -171,7 +171,7 @@ __vxfs_iget(ino_t ino, struct inode *ilistp)
        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;
 }