Merge tag 'v4.10-rc1' into asoc-samsung

Linux 4.10-rc1

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 27d2ff28132c..b6672e66cda6 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -407,13 +407,14 @@ static int socfpga_fpga_reset(struct fpga_manager *mgr)
 /*
  * Prepare the FPGA to receive the configuration data.
  */
-static int socfpga_fpga_ops_configure_init(struct fpga_manager *mgr, u32 flags,
+static int socfpga_fpga_ops_configure_init(struct fpga_manager *mgr,
+                                           struct fpga_image_info *info,
                                            const char *buf, size_t count)
 {
         struct socfpga_fpga_priv *priv = mgr->priv;
         int ret;
 
-        if (flags & FPGA_MGR_PARTIAL_RECONFIG) {
+        if (info->flags & FPGA_MGR_PARTIAL_RECONFIG) {
                 dev_err(&mgr->dev, "Partial reconfiguration not supported.\n");
                 return -EINVAL;
         }
@@ -478,7 +479,7 @@ static int socfpga_fpga_ops_configure_write(struct fpga_manager *mgr,
 }
 
 static int socfpga_fpga_ops_configure_complete(struct fpga_manager *mgr,
-                                               u32 flags)
+                                               struct fpga_image_info *info)
 {
         struct socfpga_fpga_priv *priv = mgr->priv;
         u32 status;