Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b5e0928 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

lib/vsprintf.c: remove %Z support 

Now that %z is standartised in C99 there is no reason to support %Z.
Unlike %L it doesn't even make format strings smaller.

Use BUILD_BUG_ON in a couple ATM drivers.

In case anyone didn't notice lib/vsprintf.o is about half of SLUB which
is in my opinion is quite an achievement.  Hopefully this patch inspires
someone else to trim vsprintf.c more.

Link: http://lkml.kernel.org/r/20170103230126.GA30170@avx2


Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d7f67243

block/bsg.c

+3 −3
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) 
	int ret;

	ssize_t bytes_read;



	dprintk("%s: read %Zd bytes\n", bd->name, count);

	dprintk("%s: read %zd bytes\n", bd->name, count);



	bsg_set_block(bd, file);
@@ -648,7 +648,7 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) 
	ssize_t bytes_written;

	int ret;



	dprintk("%s: write %Zd bytes\n", bd->name, count);

	dprintk("%s: write %zd bytes\n", bd->name, count);



	if (unlikely(segment_eq(get_fs(), KERNEL_DS)))

		return -EINVAL;
@@ -667,7 +667,7 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) 
	if (!bytes_written || err_block_err(ret))

		bytes_written = ret;



	dprintk("%s: returning %Zd\n", bd->name, bytes_written);

	dprintk("%s: returning %zd\n", bd->name, bytes_written);

	return bytes_written;

}

drivers/atm/ambassador.c

+1 −6
Original line number Diff line number Diff line
@@ -2394,12 +2394,7 @@ static int __init amb_module_init (void) 
{

  PRINTD (DBG_FLOW|DBG_INIT, "init_module");

  

  // sanity check - cast needed as printk does not support %Zu

  if (sizeof(amb_mem) != 4*16 + 4*12) {

    PRINTK (KERN_ERR, "Fix amb_mem (is %lu words).",

	    (unsigned long) sizeof(amb_mem));

    return -ENOMEM;

  }

  BUILD_BUG_ON(sizeof(amb_mem) != 4*16 + 4*12);

  

  show_version();

drivers/atm/eni.c

+1 −5
Original line number Diff line number Diff line
@@ -2326,11 +2326,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 (%Zd < %Zd)\n",

		    sizeof(skb->cb),sizeof(struct eni_skb_prv));

		return -EIO;

	}

	BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct eni_skb_prv));

	return pci_register_driver(&eni_driver);

}

drivers/atm/firestream.c

+6 −6
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ static int fs_open(struct atm_vcc *atm_vcc) 
	/* XXX handle qos parameters (rate limiting) ? */



	vcc = kmalloc(sizeof(struct fs_vcc), GFP_KERNEL);

	fs_dprintk (FS_DEBUG_ALLOC, "Alloc VCC: %p(%Zd)\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) 


	if (DO_DIRECTION (txtp)) {

		tc = kmalloc (sizeof (struct fs_transmit_config), GFP_KERNEL);

		fs_dprintk (FS_DEBUG_ALLOC, "Alloc tc: %p(%Zd)\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");
@@ -1185,7 +1185,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(%Zd)\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;
@@ -1492,7 +1492,7 @@ static void top_off_fp (struct fs_dev *dev, struct freepool *fp, 
		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(%Zd)\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);
@@ -1803,7 +1803,7 @@ static int fs_init(struct fs_dev *dev) 
	}

	dev->atm_vccs = kcalloc (dev->nchannels, sizeof (struct atm_vcc *),

				 GFP_KERNEL);

	fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%Zd)\n",

	fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%zd)\n",

		    dev->atm_vccs, dev->nchannels * sizeof (struct atm_vcc *));



	if (!dev->atm_vccs) {
@@ -1911,7 +1911,7 @@ static int firestream_init_one(struct pci_dev *pci_dev, 
		goto err_out;



	fs_dev = kzalloc (sizeof (struct fs_dev), GFP_KERNEL);

	fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%Zd)\n",

	fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%zd)\n",

		    fs_dev, sizeof (struct fs_dev));

	if (!fs_dev)

		goto err_out;

drivers/atm/horizon.c

+1 −6
Original line number Diff line number Diff line
@@ -2884,12 +2884,7 @@ static struct pci_driver hrz_driver = { 
/********** module entry **********/



static int __init hrz_module_init (void) {

  // sanity check - cast is needed since printk does not support %Zu

  if (sizeof(struct MEMMAP) != 128*1024/4) {

    PRINTK (KERN_ERR, "Fix struct MEMMAP (is %lu fakewords).",

	    (unsigned long) sizeof(struct MEMMAP));

    return -ENOMEM;

  }

  BUILD_BUG_ON(sizeof(struct MEMMAP) != 128*1024/4);

  

  show_version();