Commit 89270d00 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Andi Shyti
Browse files

drm/i915: remove struct_member macro 



Since it is used only to get type of member it can be replaced
with typeof_member.

Signed-off-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221209121459.3496148-1-andrzej.hajda@intel.com
parent e288e178

drivers/gpu/drm/i915/i915_utils.h

+1 −3
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ bool i915_error_injected(void); 
#define page_pack_bits(ptr, bits) ptr_pack_bits(ptr, bits, PAGE_SHIFT)

#define page_unpack_bits(ptr, bits) ptr_unpack_bits(ptr, bits, PAGE_SHIFT)



#define struct_member(T, member) (((T *)0)->member)



#define fetch_and_zero(ptr) ({						\

	typeof(*ptr) __T = *(ptr);					\

	*(ptr) = (typeof(*ptr))0;					\
@@ -170,7 +168,7 @@ static __always_inline ptrdiff_t ptrdiff(const void *a, const void *b) 
 */

#define container_of_user(ptr, type, member) ({				\

	void __user *__mptr = (void __user *)(ptr);			\

	BUILD_BUG_ON_MSG(!__same_type(*(ptr), struct_member(type, member)) && \

	BUILD_BUG_ON_MSG(!__same_type(*(ptr), typeof_member(type, member)) && \

			 !__same_type(*(ptr), void),			\

			 "pointer type mismatch in container_of()");	\

	((type __user *)(__mptr - offsetof(type, member))); })

drivers/gpu/drm/i915/intel_runtime_pm.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ struct intel_runtime_pm { 
};



#define BITS_PER_WAKEREF	\

	BITS_PER_TYPE(struct_member(struct intel_runtime_pm, wakeref_count))

	BITS_PER_TYPE(typeof_member(struct intel_runtime_pm, wakeref_count))

#define INTEL_RPM_WAKELOCK_SHIFT	(BITS_PER_WAKEREF / 2)

#define INTEL_RPM_WAKELOCK_BIAS		(1 << INTEL_RPM_WAKELOCK_SHIFT)

#define INTEL_RPM_RAW_WAKEREF_MASK	(INTEL_RPM_WAKELOCK_BIAS - 1)