]> Git Repo - J-linux.git/commitdiff
fpga: remove redundant checks for bridge ops
authorMarco Pagani <[email protected]>
Thu, 1 Feb 2024 15:57:12 +0000 (16:57 +0100)
committerXu Yilun <[email protected]>
Sun, 18 Feb 2024 10:07:06 +0000 (18:07 +0800)
Commit 0d70af3c2530 ("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 <[email protected]>
Acked-by: Xu Yilun <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Xu Yilun <[email protected]>
drivers/fpga/fpga-bridge.c

index a024be2b84e2913d0be7b3621c21080dd5583793..79c473b3c7c3d5aa4ff1a824dbc7737a49528305 100644 (file)
@@ -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;
@@ -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;
@@ -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);
This page took 0.0523 seconds and 4 git commands to generate.