Merge android11-5.4.147+ (f2bbf1b7) into msm-5.4

* refs/heads/tmp-f2bbf1b7:
  UPSTREAM: drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions
  UPSTREAM: x86/pci: Fix the function type for check_reserved_t

Change-Id: Ief8eeb24700579c0817848d4715b49e7a3c5b62d
Signed-off-by: Srinivasarao Pathipati <quic_spathi@quicinc.com>