lkml.org 
[lkml]   [2023]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH net-next v2 03/11] pds_core: devlink health: use retained error fmsg API
    From
    On 10/17/2023 3:53 AM, Przemek Kitszel wrote:
    >
    > Drop unneeded error checking.
    >
    > devlink_fmsg_*() family of functions is now retaining errors,
    > so there is no need to check for them after each call.
    >
    > Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    > Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>

    Thanks,

    Reviewed-by: Shannon Nelson <shannon.nelson@amd.com>

    > ---
    > add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-57 (-57)
    > ---
    > drivers/net/ethernet/amd/pds_core/devlink.c | 29 ++++++---------------
    > 1 file changed, 8 insertions(+), 21 deletions(-)
    >
    > diff --git a/drivers/net/ethernet/amd/pds_core/devlink.c b/drivers/net/ethernet/amd/pds_core/devlink.c
    > index d9607033bbf2..8b2b9e0d59f3 100644
    > --- a/drivers/net/ethernet/amd/pds_core/devlink.c
    > +++ b/drivers/net/ethernet/amd/pds_core/devlink.c
    > @@ -154,33 +154,20 @@ int pdsc_fw_reporter_diagnose(struct devlink_health_reporter *reporter,
    > struct netlink_ext_ack *extack)
    > {
    > struct pdsc *pdsc = devlink_health_reporter_priv(reporter);
    > - int err;
    >
    > mutex_lock(&pdsc->config_lock);
    > -
    > if (test_bit(PDSC_S_FW_DEAD, &pdsc->state))
    > - err = devlink_fmsg_string_pair_put(fmsg, "Status", "dead");
    > + devlink_fmsg_string_pair_put(fmsg, "Status", "dead");
    > else if (!pdsc_is_fw_good(pdsc))
    > - err = devlink_fmsg_string_pair_put(fmsg, "Status", "unhealthy");
    > + devlink_fmsg_string_pair_put(fmsg, "Status", "unhealthy");
    > else
    > - err = devlink_fmsg_string_pair_put(fmsg, "Status", "healthy");
    > -
    > + devlink_fmsg_string_pair_put(fmsg, "Status", "healthy");
    > mutex_unlock(&pdsc->config_lock);
    >
    > - if (err)
    > - return err;
    > -
    > - err = devlink_fmsg_u32_pair_put(fmsg, "State",
    > - pdsc->fw_status &
    > - ~PDS_CORE_FW_STS_F_GENERATION);
    > - if (err)
    > - return err;
    > -
    > - err = devlink_fmsg_u32_pair_put(fmsg, "Generation",
    > - pdsc->fw_generation >> 4);
    > - if (err)
    > - return err;
    > + devlink_fmsg_u32_pair_put(fmsg, "State",
    > + pdsc->fw_status & ~PDS_CORE_FW_STS_F_GENERATION);
    > + devlink_fmsg_u32_pair_put(fmsg, "Generation", pdsc->fw_generation >> 4);
    > + devlink_fmsg_u32_pair_put(fmsg, "Recoveries", pdsc->fw_recoveries);
    >
    > - return devlink_fmsg_u32_pair_put(fmsg, "Recoveries",
    > - pdsc->fw_recoveries);
    > + return 0;
    > }
    > --
    > 2.40.1
    >

    \
     
     \ /
      Last update: 2023-10-17 18:54    [W:4.122 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site