ptp: ocp: Remove pending_image indicator from devlink

After writing an image blob to the flash memory, a reboot is required
to reload the FPGA.  There is no versioning prsent in the FPGA image
file, so only a running version is available.  The 'stored version'
was set to 'pending' in order to indicate a reboot was needed.

This isn't reliable, as the module could be unloaded/loaded, losing
the "reboot needed" indicator.  Also, the devlink 'stored version'
information is designed to refer to the actual image version.

Unfortunately, there is no method to determine the flash image version
other than booting it, so remove the devlink stored version setting.

Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 1412015fd2619fc06d1c7d96ad86dbbee535dec5..6b9c145869871a2ebc322b54b979779828b8afc6 100644 (file)
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -171,7 +171,6 @@ struct ptp_ocp {
        u8                      serial[6];
        int                     flash_start;
        bool                    has_serial;
-       bool                    pending_image;
 };
 
 struct ocp_resource {
@@ -836,8 +835,6 @@ ptp_ocp_devlink_flash_update(struct devlink *devlink,
        msg = err ? "Flash error" : "Flash complete";
        devlink_flash_update_status_notify(devlink, msg, NULL, 0, 0);
 
-       bp->pending_image = true;
-
        put_device(dev);
        return err;
 }
@@ -854,13 +851,6 @@ ptp_ocp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,
        if (err)
                return err;
 
-       if (bp->pending_image) {
-               err = devlink_info_version_stored_put(req,
-                                                     "timecard", "pending");
-               if (err)
-                       return err;
-       }
-
        if (bp->image) {
                u32 ver = ioread32(&bp->image->version);