From: Przemek Kitszel <przemyslaw.kitszel@intel.com>
To: Jiri Pirko <jiri@resnulli.us>,
netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Shannon Nelson <shannon.nelson@amd.com>,
Michael Chan <michael.chan@broadcom.com>,
Cai Huoqing <cai.huoqing@linux.dev>,
George Cherian <george.cherian@marvell.com>,
Danielle Ratson <danieller@nvidia.com>,
Moshe Shemesh <moshe@nvidia.com>,
Saeed Mahameed <saeedm@nvidia.com>,
Ariel Elior <aelior@marvell.com>,
Manish Chopra <manishc@marvell.com>,
Igor Russkikh <irusskikh@marvell.com>,
Coiby Xu <coiby.xu@gmail.com>
Cc: Brett Creeley <brett.creeley@amd.com>,
Sunil Goutham <sgoutham@marvell.com>,
Linu Cherian <lcherian@marvell.com>,
Geetha sowjanya <gakula@marvell.com>,
Jerin Jacob <jerinj@marvell.com>, hariprasad <hkelam@marvell.com>,
Subbaraya Sundeep <sbhatta@marvell.com>,
Ido Schimmel <idosch@nvidia.com>, Petr Machata <petrm@nvidia.com>,
Eran Ben Elisha <eranbe@nvidia.com>,
Aya Levin <ayal@mellanox.com>, Leon Romanovsky <leon@kernel.org>,
linux-kernel@vger.kernel.org,
Przemek Kitszel <przemyslaw.kitszel@intel.com>
Subject: [PATCH net-next v2 10/11] staging: qlge: devlink health: use retained error fmsg API
Date: Tue, 17 Oct 2023 12:53:40 +0200 [thread overview]
Message-ID: <20231017105341.415466-11-przemyslaw.kitszel@intel.com> (raw)
In-Reply-To: <20231017105341.415466-1-przemyslaw.kitszel@intel.com>
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.
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
---
drivers/staging/qlge/qlge_devlink.c | 60 ++++++++---------------------
1 file changed, 16 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/qlge/qlge_devlink.c b/drivers/staging/qlge/qlge_devlink.c
index 0ab02d6d3817..0b19363ca2e9 100644
--- a/drivers/staging/qlge/qlge_devlink.c
+++ b/drivers/staging/qlge/qlge_devlink.c
@@ -2,51 +2,29 @@
#include "qlge.h"
#include "qlge_devlink.h"
-static int qlge_fill_seg_(struct devlink_fmsg *fmsg,
- struct mpi_coredump_segment_header *seg_header,
- u32 *reg_data)
+static void qlge_fill_seg_(struct devlink_fmsg *fmsg,
+ struct mpi_coredump_segment_header *seg_header,
+ u32 *reg_data)
{
int regs_num = (seg_header->seg_size
- sizeof(struct mpi_coredump_segment_header)) / sizeof(u32);
- int err;
int i;
- err = devlink_fmsg_pair_nest_start(fmsg, seg_header->description);
- if (err)
- return err;
- err = devlink_fmsg_obj_nest_start(fmsg);
- if (err)
- return err;
- err = devlink_fmsg_u32_pair_put(fmsg, "segment", seg_header->seg_num);
- if (err)
- return err;
- err = devlink_fmsg_arr_pair_nest_start(fmsg, "values");
- if (err)
- return err;
+ devlink_fmsg_pair_nest_start(fmsg, seg_header->description);
+ devlink_fmsg_obj_nest_start(fmsg);
+ devlink_fmsg_u32_pair_put(fmsg, "segment", seg_header->seg_num);
+ devlink_fmsg_arr_pair_nest_start(fmsg, "values");
for (i = 0; i < regs_num; i++) {
- err = devlink_fmsg_u32_put(fmsg, *reg_data);
- if (err)
- return err;
+ devlink_fmsg_u32_put(fmsg, *reg_data);
reg_data++;
}
- err = devlink_fmsg_obj_nest_end(fmsg);
- if (err)
- return err;
- err = devlink_fmsg_arr_pair_nest_end(fmsg);
- if (err)
- return err;
- err = devlink_fmsg_pair_nest_end(fmsg);
- return err;
+ devlink_fmsg_obj_nest_end(fmsg);
+ devlink_fmsg_arr_pair_nest_end(fmsg);
+ devlink_fmsg_pair_nest_end(fmsg);
}
-#define FILL_SEG(seg_hdr, seg_regs) \
- do { \
- err = qlge_fill_seg_(fmsg, &dump->seg_hdr, dump->seg_regs); \
- if (err) { \
- kvfree(dump); \
- return err; \
- } \
- } while (0)
+#define FILL_SEG(seg_hdr, seg_regs) \
+ qlge_fill_seg_(fmsg, &dump->seg_hdr, dump->seg_regs)
static int qlge_reporter_coredump(struct devlink_health_reporter *reporter,
struct devlink_fmsg *fmsg, void *priv_ctx,
@@ -114,14 +92,8 @@ static int qlge_reporter_coredump(struct devlink_health_reporter *reporter,
FILL_SEG(xfi_hss_tx_hdr, serdes_xfi_hss_tx);
FILL_SEG(xfi_hss_rx_hdr, serdes_xfi_hss_rx);
FILL_SEG(xfi_hss_pll_hdr, serdes_xfi_hss_pll);
-
- err = qlge_fill_seg_(fmsg, &dump->misc_nic_seg_hdr,
- (u32 *)&dump->misc_nic_info);
- if (err) {
- kvfree(dump);
- return err;
- }
-
+ qlge_fill_seg_(fmsg, &dump->misc_nic_seg_hdr,
+ (u32 *)&dump->misc_nic_info);
FILL_SEG(intr_states_seg_hdr, intr_states);
FILL_SEG(cam_entries_seg_hdr, cam_entries);
FILL_SEG(nic_routing_words_seg_hdr, nic_routing_words);
@@ -140,7 +112,7 @@ static int qlge_reporter_coredump(struct devlink_health_reporter *reporter,
FILL_SEG(sem_regs_seg_hdr, sem_regs);
kvfree(dump);
- return err;
+ return 0;
}
static const struct devlink_health_reporter_ops qlge_reporter_ops = {
--
2.40.1
next prev parent reply other threads:[~2023-10-17 10:54 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-17 10:53 [PATCH net-next v2 00/11] devlink: retain error in struct devlink_fmsg Przemek Kitszel
2023-10-17 10:53 ` [PATCH net-next v2 01/11] " Przemek Kitszel
2023-10-17 10:53 ` [PATCH net-next v2 02/11] netdevsim: devlink health: use retained error fmsg API Przemek Kitszel
2023-10-18 1:20 ` Jakub Kicinski
2023-10-17 10:53 ` [PATCH net-next v2 03/11] pds_core: " Przemek Kitszel
2023-10-17 11:06 ` Jiri Pirko
2023-10-17 11:15 ` Jiri Pirko
2023-10-17 11:35 ` Przemek Kitszel
2023-10-17 16:52 ` Nelson, Shannon
2023-10-17 10:53 ` [PATCH net-next v2 04/11] bnxt_en: " Przemek Kitszel
2023-10-17 10:53 ` [PATCH net-next v2 05/11] hinic: " Przemek Kitszel
2023-10-17 10:53 ` [PATCH net-next v2 06/11] octeontx2-af: " Przemek Kitszel
2023-10-17 10:53 ` [PATCH net-next v2 07/11] mlxsw: core: " Przemek Kitszel
2023-10-17 10:53 ` [PATCH net-next v2 08/11] net/mlx5: " Przemek Kitszel
2023-10-18 16:08 ` Simon Horman
2023-10-17 10:53 ` [PATCH net-next v2 09/11] qed: " Przemek Kitszel
2023-10-17 10:53 ` Przemek Kitszel [this message]
2023-10-18 1:15 ` [PATCH net-next v2 10/11] staging: qlge: " Jakub Kicinski
2023-10-19 14:28 ` Benjamin Poirier
2023-10-19 14:42 ` Jakub Kicinski
2023-10-19 18:32 ` Benjamin Poirier
2023-10-17 10:53 ` [PATCH net-next v2 11/11] devlink: convert most of devlink_fmsg_*() to return void Przemek Kitszel
2023-10-18 16:10 ` Simon Horman
2023-10-17 11:17 ` [PATCH net-next v2 00/11] devlink: retain error in struct devlink_fmsg Jiri Pirko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231017105341.415466-11-przemyslaw.kitszel@intel.com \
--to=przemyslaw.kitszel@intel.com \
--cc=aelior@marvell.com \
--cc=ayal@mellanox.com \
--cc=brett.creeley@amd.com \
--cc=cai.huoqing@linux.dev \
--cc=coiby.xu@gmail.com \
--cc=danieller@nvidia.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eranbe@nvidia.com \
--cc=gakula@marvell.com \
--cc=george.cherian@marvell.com \
--cc=hkelam@marvell.com \
--cc=idosch@nvidia.com \
--cc=irusskikh@marvell.com \
--cc=jerinj@marvell.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=lcherian@marvell.com \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manishc@marvell.com \
--cc=michael.chan@broadcom.com \
--cc=moshe@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=saeedm@nvidia.com \
--cc=sbhatta@marvell.com \
--cc=sgoutham@marvell.com \
--cc=shannon.nelson@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).