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

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
...@@ -149,8 +149,6 @@ bool i915_error_injected(void); ...@@ -149,8 +149,6 @@ bool i915_error_injected(void);
#define page_pack_bits(ptr, bits) ptr_pack_bits(ptr, bits, PAGE_SHIFT) #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 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) ({ \ #define fetch_and_zero(ptr) ({ \
typeof(*ptr) __T = *(ptr); \ typeof(*ptr) __T = *(ptr); \
*(ptr) = (typeof(*ptr))0; \ *(ptr) = (typeof(*ptr))0; \
...@@ -170,7 +168,7 @@ static __always_inline ptrdiff_t ptrdiff(const void *a, const void *b) ...@@ -170,7 +168,7 @@ static __always_inline ptrdiff_t ptrdiff(const void *a, const void *b)
*/ */
#define container_of_user(ptr, type, member) ({ \ #define container_of_user(ptr, type, member) ({ \
void __user *__mptr = (void __user *)(ptr); \ 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), \ !__same_type(*(ptr), void), \
"pointer type mismatch in container_of()"); \ "pointer type mismatch in container_of()"); \
((type __user *)(__mptr - offsetof(type, member))); }) ((type __user *)(__mptr - offsetof(type, member))); })
......
...@@ -96,7 +96,7 @@ struct intel_runtime_pm { ...@@ -96,7 +96,7 @@ struct intel_runtime_pm {
}; };
#define BITS_PER_WAKEREF \ #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_SHIFT (BITS_PER_WAKEREF / 2)
#define INTEL_RPM_WAKELOCK_BIAS (1 << INTEL_RPM_WAKELOCK_SHIFT) #define INTEL_RPM_WAKELOCK_BIAS (1 << INTEL_RPM_WAKELOCK_SHIFT)
#define INTEL_RPM_RAW_WAKEREF_MASK (INTEL_RPM_WAKELOCK_BIAS - 1) #define INTEL_RPM_RAW_WAKEREF_MASK (INTEL_RPM_WAKELOCK_BIAS - 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment