Change FWU provider to use rpc_service_interface

Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I8d3eb07f126a052b0eb27f28e00b731b6259b959
diff --git a/components/service/fwu/provider/fwu_provider.h b/components/service/fwu/provider/fwu_provider.h
index 94c6ce5..037889a 100644
--- a/components/service/fwu/provider/fwu_provider.h
+++ b/components/service/fwu/provider/fwu_provider.h
@@ -8,9 +8,8 @@
 #define FWU_PROVIDER_H
 
 #include "protocols/rpc/common/packed-c/encoding.h"
-#include "rpc/common/endpoint/rpc_interface.h"
+#include "rpc/common/endpoint/rpc_service_interface.h"
 #include "service/common/provider/service_provider.h"
-#include "service/discovery/provider/discovery_provider.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,7 +33,6 @@
 struct fwu_provider {
 	struct service_provider base_provider;
 	const struct fwu_provider_serializer *serializers[TS_RPC_ENCODING_LIMIT];
-	struct discovery_provider discovery_provider;
 	struct update_agent *update_agent;
 };
 
@@ -46,8 +44,8 @@
  *
  * \return A pointer to the exposed rpc_interface or NULL on failure
  */
-struct rpc_interface *fwu_provider_init(struct fwu_provider *context,
-					struct update_agent *update_agent);
+struct rpc_service_interface *fwu_provider_init(struct fwu_provider *context,
+						struct update_agent *update_agent);
 
 /**
  * \brief De-initialise a fwu_provider