linux-next: manual merge of the char-misc tree with the char-misc.current tree

Cheers,
Stephen Rothwell

diff --cc drivers/firmware/stratix10-svc.c
index 00f58e27f6de,3acfa067c5dd..000000000000
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@@ -134,7 -255,7 +255,8 @@@ struct stratix10_async_ctrl 
   * @complete_status: state for completion
   * @svc_fifo_lock: protect access to service message data queue
   * @invoke_fn: function to issue secure monitor call or hypervisor call
 + * @svc: manages the list of client svc drivers
+  * @actrl: async control structure
   *
   * This struct is used to create communication channels for service clients, to
   * handle secure monitor or hypervisor call.
@@@ -151,7 -272,7 +273,8 @@@ struct stratix10_svc_controller 
  	struct completion complete_status;
  	spinlock_t svc_fifo_lock;
  	svc_invoke_fn *invoke_fn;
 +	struct stratix10_svc *svc;
+ 	struct stratix10_async_ctrl actrl;
  };
  
  /**
@@@ -1257,9 -2002,11 +2003,11 @@@ err_destroy_pool
  
  static void stratix10_svc_drv_remove(struct platform_device *pdev)
  {
 -	struct stratix10_svc *svc = dev_get_drvdata(&pdev->dev);
  	struct stratix10_svc_controller *ctrl = platform_get_drvdata(pdev);
 +	struct stratix10_svc *svc = ctrl->svc;
  
+ 	stratix10_svc_async_exit(ctrl);
+ 
  	of_platform_depopulate(ctrl->dev);
  
  	platform_device_unregister(svc->intel_svc_fcs);