[NIU]: Cleanup PAGE_SIZE checks a bit (81429973) · Commits · 戴 / test

I get the following warning from a powerpc allyesconfig of current mainline: drivers/net/niu.c: In function 'niu_size_rbr': drivers/net/niu.c:3113: warning: large integer implicitly truncated to unsigned type PAGE_SIZE in this case is 64KB, so I don't quite get why gcc can't tell that the line in question will never be reached. I suggest the following instead, but I can unfortunately not do anything but build test it. Also, the driver does some other checks to make sure that PAGE_SIZE is a power of two (BUILD_BUG_ON() in niu_init()), doesn't seem like that could ever be untrue? Or are there really archs with non-power-of-two PAGE_SIZE? Signed-off-by:

Olof Johansson <olof@lixom.net> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/niu.c

+5 −29

Original line number	Diff line number	Diff line
		@@ -3103,31 +3103,12 @@ static int niu_alloc_tx_ring_info(struct niu *np,

		static void niu_size_rbr(struct niu np, struct rx_ring_info rp)
		{
		u16 bs;
		u16 bss;

		switch (PAGE_SIZE) {
		case 4 * 1024:
		case 8 * 1024:
		case 16 * 1024:
		case 32 * 1024:
		rp->rbr_block_size = PAGE_SIZE;
		rp->rbr_blocks_per_page = 1;
		break;
		bss = min(PAGE_SHIFT, 15);

		default:
		if (PAGE_SIZE % (32 * 1024) == 0)
		bs = 32 * 1024;
		else if (PAGE_SIZE % (16 * 1024) == 0)
		bs = 16 * 1024;
		else if (PAGE_SIZE % (8 * 1024) == 0)
		bs = 8 * 1024;
		else if (PAGE_SIZE % (4 * 1024) == 0)
		bs = 4 * 1024;
		else
		BUG();
		rp->rbr_block_size = bs;
		rp->rbr_blocks_per_page = PAGE_SIZE / bs;
		}
		rp->rbr_block_size = 1 << bss;
		rp->rbr_blocks_per_page = 1 << (PAGE_SHIFT-bss);

		rp->rbr_sizes[0] = 256;
		rp->rbr_sizes[1] = 1024;
		@@ -7902,12 +7883,7 @@ static int __init niu_init(void)
		{
		int err = 0;

		BUILD_BUG_ON((PAGE_SIZE < 4 * 1024) \|\|
		((PAGE_SIZE > 32 * 1024) &&
		((PAGE_SIZE % (32 * 1024)) != 0 &&
		(PAGE_SIZE % (16 * 1024)) != 0 &&
		(PAGE_SIZE % (8 * 1024)) != 0 &&
		(PAGE_SIZE % (4 * 1024)) != 0)));
		BUILD_BUG_ON(PAGE_SIZE < 4 * 1024);

		niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT);

Admin message