This looks much better. But the new file still looks almost like a copy and paste of tc-dwc-g210-pci.c. Wouldnt it make more sense to start with a common ufshcd-pci driver that sets up the ufs_hba_variant_opsA based on the PCI ID table? Also given that this almost entitrely a copy & paste job of tc-dwc-g210-pci.c. you should add the copyrights and following their license.