efi/gop: Use helper macros for find_bits (9867fc9d) · Commits · 戴 / test

Use the __ffs/__fls macros to calculate the position and size of the mask. Correct type of mask to u32 instead of unsigned long. Signed-off-by:

drivers/firmware/efi/libstub/gop.c

+8 −18

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		*
		* ----------------------------------------------------------------------- */

		#include <linux/bitops.h>
		#include <linux/efi.h>
		#include <linux/screen_info.h>
		#include <asm/efi.h>
		@@ -12,27 +13,16 @@

		#include "efistub.h"

		static void find_bits(unsigned long mask, u8 pos, u8 size)
		static void find_bits(u32 mask, u8 pos, u8 size)
		{
		u8 first, len;

		first = 0;
		len = 0;

		if (mask) {
		while (!(mask & 0x1)) {
		mask = mask >> 1;
		first++;
		}

		while (mask & 0x1) {
		mask = mask >> 1;
		len++;
		}
		if (!mask) {
		pos = size = 0;
		return;
		}

		*pos = first;
		*size = len;
		/* UEFI spec guarantees that the set bits are contiguous */
		*pos = __ffs(mask);
		size = __fls(mask) - pos + 1;
		}

		static void