Remove legacy hf_vm_get_count and hf_vcpu_get_count calls.

These are now covered by FFA_PARTITION_INFO_GET.

Change-Id: I1bfb0eff1b1eeaf1f2c0cfefcef3596fa771ed71
diff --git a/inc/vmapi/hf/abi.h b/inc/vmapi/hf/abi.h
index 66f09fd..b537d1c 100644
--- a/inc/vmapi/hf/abi.h
+++ b/inc/vmapi/hf/abi.h
@@ -15,17 +15,15 @@
 /* clang-format off */
 
 /* TODO: Define constants below according to spec. */
-#define HF_VM_GET_COUNT                0xff01
-#define HF_VCPU_GET_COUNT              0xff02
-#define HF_MAILBOX_WRITABLE_GET        0xff03
-#define HF_MAILBOX_WAITER_GET          0xff04
-#define HF_INTERRUPT_ENABLE            0xff05
-#define HF_INTERRUPT_GET               0xff06
-#define HF_INTERRUPT_INJECT            0xff07
+#define HF_MAILBOX_WRITABLE_GET        0xff01
+#define HF_MAILBOX_WAITER_GET          0xff02
+#define HF_INTERRUPT_ENABLE            0xff03
+#define HF_INTERRUPT_GET               0xff04
+#define HF_INTERRUPT_INJECT            0xff05
 
 /* Custom FF-A-like calls returned from FFA_RUN. */
-#define HF_FFA_RUN_WAIT_FOR_INTERRUPT 0xff09
-#define HF_FFA_RUN_WAKE_UP            0xff0a
+#define HF_FFA_RUN_WAIT_FOR_INTERRUPT 0xff06
+#define HF_FFA_RUN_WAKE_UP            0xff07
 
 /* This matches what Trusty and its ATF module currently use. */
 #define HF_DEBUG_LOG            0xbd000000