diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 18:44:33 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 18:44:33 +0200 |
commit | c3328c5e644a5d027ecd75878aaa253e5fb417bc (patch) | |
tree | df0f599b79534810229e80f96bd4dcaf7d04faaa /drivers/fpga/fpga-bridge.c | |
parent | 71e69d7adee10a55b817df748dec5bfec7bf4c30 (diff) | |
parent | 630211a17055bafd21fb83ae8c0002b2e214ebb2 (diff) | |
download | linux-c3328c5e644a5d027ecd75878aaa253e5fb417bc.tar.gz linux-c3328c5e644a5d027ecd75878aaa253e5fb417bc.tar.bz2 linux-c3328c5e644a5d027ecd75878aaa253e5fb417bc.zip |
Merge tag 'fpga-for-5.15-early' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga into char-misc-next
Moritz writes:
FPGA Manager Changes for 5.15-rc1
FPGA Manager
- Navin's change removes a duplicate word in a comment
- Tom's change fixes a spelling mistake
- Mauro's change fixes up documentation
- Tom's second set adds wrappers to allow drivers not having to
implement empty functions by moving checks into fpga-mgr core code
- My changes address a bunch of warnings
DFL
- Martin's change adds a new PCI ID for Silicom N501x PAC cards
All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of my for-next branch).
I did get a complaint about one of the commit messages w/ a Fixes: tags
which has been addressed.
Signed-offy-by: Moritz Fischer <mdf@kernel.org>
* tag 'fpga-for-5.15-early' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
fpga: fpga-mgr: wrap the write_sg() op
fpga: fpga-mgr: wrap the fpga_remove() op
fpga: fpga-mgr: wrap the state() op
fpga: fpga-mgr: wrap the status() op
fpga: fpga-mgr: wrap the write() op
fpga: fpga-mgr: make write_complete() op optional
fpga: fpga-mgr: wrap the write_init() op
fpga: zynqmp-fpga: Address warning about unused variable
fpga: xilinx-pr-decoupler: Address warning about unused variable
fpga: xiilnx-spi: Address warning about unused variable
fpga: altera-freeze-bridge: Address warning about unused variable
fpga: dfl: pci: add device IDs for Silicom N501x PAC cards
fpga: fpga-bridge: removed repeated word
fpga: fix spelling mistakes
docs: driver-api: fpga: avoid using UTF-8 chars
Diffstat (limited to 'drivers/fpga/fpga-bridge.c')
-rw-r--r-- | drivers/fpga/fpga-bridge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c index 2bfb2ff86930..798f55670646 100644 --- a/drivers/fpga/fpga-bridge.c +++ b/drivers/fpga/fpga-bridge.c @@ -228,9 +228,9 @@ EXPORT_SYMBOL_GPL(fpga_bridges_put); * @info: fpga image specific information * @bridge_list: list of FPGA bridges * - * Get an exclusive reference to the bridge and and it to the list. + * Get an exclusive reference to the bridge and it to the list. * - * Return 0 for success, error code from of_fpga_bridge_get() othewise. + * Return 0 for success, error code from of_fpga_bridge_get() otherwise. */ int of_fpga_bridge_get_to_list(struct device_node *np, struct fpga_image_info *info, @@ -258,9 +258,9 @@ EXPORT_SYMBOL_GPL(of_fpga_bridge_get_to_list); * @info: fpga image specific information * @bridge_list: list of FPGA bridges * - * Get an exclusive reference to the bridge and and it to the list. + * Get an exclusive reference to the bridge and it to the list. * - * Return 0 for success, error code from fpga_bridge_get() othewise. + * Return 0 for success, error code from fpga_bridge_get() otherwise. */ int fpga_bridge_get_to_list(struct device *dev, struct fpga_image_info *info, |