From: trix@redhat•com
To: hao.wu@intel•com, mdf@kernel•org, 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 v2 6/7] fpga-mgr: wrap the fpga_remove() op
Date: Tue, 8 Jun 2021 12:55:05 -0700 [thread overview]
Message-ID: <20210608195506.3022550-8-trix@redhat.com> (raw)
In-Reply-To: <20210608195506.3022550-1-trix@redhat.com>
From: Tom Rix <trix@redhat•com>
An FPGA manager is not required to provide a fpga_remove() op.
Add a wrapper consistent with the other op wrappers.
Move op check to wrapper.
Signed-off-by: Tom Rix <trix@redhat•com>
---
drivers/fpga/fpga-mgr.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index d06752be9c6ef..84808c7ca4406 100644
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -731,6 +731,12 @@ int fpga_mgr_register(struct fpga_manager *mgr)
}
EXPORT_SYMBOL_GPL(fpga_mgr_register);
+static void fpga_mgr_fpga_remove(struct fpga_manager *mgr)
+{
+ if (mgr->mops && mgr->mops->fpga_remove)
+ mgr->mops->fpga_remove(mgr);
+}
+
/**
* fpga_mgr_unregister - unregister a FPGA manager
* @mgr: fpga manager struct
@@ -745,8 +751,7 @@ void fpga_mgr_unregister(struct fpga_manager *mgr)
* If the low level driver provides a method for putting fpga into
* a desired state upon unregister, do it.
*/
- if (mgr->mops->fpga_remove)
- mgr->mops->fpga_remove(mgr);
+ fpga_mgr_fpga_remove(mgr);
device_unregister(&mgr->dev);
}
--
2.26.3
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-08 20:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 19:54 [PATCH v2 0/7] wrappers for fpga_manager_ops trix
2021-06-08 19:54 ` trix
2021-06-08 19:55 ` [PATCH v2 1/7] fpga-mgr: wrap the write_init() op trix
2021-06-08 19:55 ` [PATCH v2 2/7] fpga-mgr: make write_complete() op optional trix
2021-06-08 19:55 ` [PATCH v2 3/7] fpga-mgr: wrap the write() op trix
2021-06-08 19:55 ` [PATCH v2 4/7] fpga-mgr: wrap the status() op trix
2021-06-08 19:55 ` [PATCH v2 5/7] fpga-mgr: wrap the state() op trix
2021-06-08 19:55 ` trix [this message]
2021-06-08 19:55 ` [PATCH v2 7/7] fpga-mgr: collect wrappers and change to inline trix
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=20210608195506.3022550-8-trix@redhat.com \
--to=trix@redhat$(echo .)com \
--cc=hao.wu@intel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-fpga@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=mdf@kernel$(echo .)org \
--cc=michal.simek@xilinx$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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