Commit 1a349dc3 authored by Marco Pagani's avatar Marco Pagani Committed by Wupeng Ma
Browse files

fpga: remove redundant checks for bridge ops 

mainline inclusion
from mainline-v6.9-rc1
commit b1a91ca25f15b6d7b311de4465854a5981dee3d3
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA7YMH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b1a91ca25f15b6d7b311de4465854a5981dee3d3



--------------------------------

Commit 0d70af3c ("fpga: bridge: Use standard dev_release for class
driver") introduced a check in fpga_bridge_register() that prevents
registering a bridge without ops, making checking on every call
redundant.

Signed-off-by: default avatarMarco Pagani <marpagan@redhat.com>
Acked-by: default avatarXu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20240201155713.82898-1-marpagan@redhat.com


Signed-off-by: default avatarXu Yilun <yilun.xu@linux.intel.com>

Conflicts:
	drivers/fpga/fpga-bridge.c
[Ma Wupeng: context conflict]
Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
parent 27e09cfe

drivers/fpga/fpga-bridge.c

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ int fpga_bridge_enable(struct fpga_bridge *bridge) 
{

	dev_dbg(&bridge->dev, "enable\n");



	if (bridge->br_ops && bridge->br_ops->enable_set)

	if (bridge->br_ops->enable_set)

		return bridge->br_ops->enable_set(bridge, 1);



	return 0;
@@ -48,7 +48,7 @@ int fpga_bridge_disable(struct fpga_bridge *bridge) 
{

	dev_dbg(&bridge->dev, "disable\n");



	if (bridge->br_ops && bridge->br_ops->enable_set)

	if (bridge->br_ops->enable_set)

		return bridge->br_ops->enable_set(bridge, 0);



	return 0;
@@ -295,7 +295,7 @@ static ssize_t state_show(struct device *dev, 
	struct fpga_bridge *bridge = to_fpga_bridge(dev);

	int enable = 1;



	if (bridge->br_ops && bridge->br_ops->enable_show)

	if (bridge->br_ops->enable_show)

		enable = bridge->br_ops->enable_show(bridge);



	return sprintf(buf, "%s\n", enable ? "enabled" : "disabled");
@@ -397,7 +397,7 @@ void fpga_bridge_unregister(struct fpga_bridge *bridge) 
	 * If the low level driver provides a method for putting bridge into

	 * a desired state upon unregister, do it.

	 */

	if (bridge->br_ops && bridge->br_ops->fpga_bridge_remove)

	if (bridge->br_ops->fpga_bridge_remove)

		bridge->br_ops->fpga_bridge_remove(bridge);



	device_unregister(&bridge->dev);