From: trix@redhat.com
To: mdf@kernel.org, hao.wu@intel.com, michal.simek@xilinx.com
Cc: linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, Tom Rix <trix@redhat.com>
Subject: [PATCH v4 5/5] fpga: fpga-mgr: simplify mops check in wrappers
Date: Thu, 24 Jun 2021 14:17:27 -0700 [thread overview]
Message-ID: <20210624211727.501019-7-trix@redhat.com> (raw)
In-Reply-To: <20210624211727.501019-1-trix@redhat.com>
From: Tom Rix <trix@redhat.com>
The mops value is checked in fpga_mgr_create,
do not check it twice.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/fpga/fpga-mgr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index 2abb7043858dc..21b4fd34b1dbf 100644
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -28,14 +28,14 @@ struct fpga_mgr_devres {
/* mops wrappers */
static inline enum fpga_mgr_states fpga_mgr_state(struct fpga_manager *mgr)
{
- if (mgr->mops && mgr->mops->state)
+ if (mgr->mops->state)
return mgr->mops->state(mgr);
return FPGA_MGR_STATE_UNKNOWN;
}
static inline u64 fpga_mgr_status(struct fpga_manager *mgr)
{
- if (mgr->mops && mgr->mops->status)
+ if (mgr->mops->status)
return mgr->mops->status(mgr);
return 0;
}
@@ -93,7 +93,7 @@ static inline int fpga_mgr_write_complete(struct fpga_manager *mgr,
static inline void fpga_mgr_fpga_remove(struct fpga_manager *mgr)
{
- if (mgr->mops && mgr->mops->fpga_remove)
+ if (mgr->mops->fpga_remove)
mgr->mops->fpga_remove(mgr);
}
--
2.26.3
prev parent reply other threads:[~2021-06-24 21:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-24 21:17 [PATCH v4 0/5] generalize fpga_mgr_load trix
2021-06-24 21:17 ` [PATCH v4 1/5] fpga: generalize updating the card trix
2021-06-24 21:17 ` [PATCH v4 2/5] fpga: add FPGA_MGR_REIMAGE flag trix
2021-06-24 21:17 ` [PATCH v4 3/5] fpga: pass fpga_manager_update_ops to the fpga_manager_write functions trix
2021-06-24 21:17 ` [PATCH v4 4/5] fpga: use reimage ops in fpga_mgr_load() trix
2021-06-24 21:17 ` trix [this message]
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=20210624211727.501019-7-trix@redhat.com \
--to=trix@redhat.com \
--cc=hao.wu@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=michal.simek@xilinx.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).