Merge branch 'for-5.16/amd-sfh' into for-linus

- code cleanups (Basavaraj Natikar, Christophe JAILLET)