Skip to content

Commit

Permalink
fpga: remove redundant checks for bridge ops
Browse files Browse the repository at this point in the history
Commit 0d70af3 ("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: Marco Pagani <marpagan@redhat.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20240201155713.82898-1-marpagan@redhat.com
Signed-off-by: Xu Yilun <yilun.xu@linux.intel.com>
  • Loading branch information
Marco Pagani authored and Xu Yilun committed Feb 18, 2024
1 parent c20445b commit b1a91ca
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/fpga/fpga-bridge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -296,7 +296,7 @@ static ssize_t state_show(struct device *dev,
struct fpga_bridge *bridge = to_fpga_bridge(dev);
int state = 1;

if (bridge->br_ops && bridge->br_ops->enable_show) {
if (bridge->br_ops->enable_show) {
state = bridge->br_ops->enable_show(bridge);
if (state < 0)
return state;
Expand Down Expand Up @@ -401,7 +401,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);
Expand Down

0 comments on commit b1a91ca

Please sign in to comment.