ath10k: fix conflict error

I accidentally dropped few hunks from Michal's patch
"ath10k: cleanup hw init-related code". Apply them now.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>