]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ptp_ocp: drop duplicate NULL check in ptp_ocp_detach()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 8 Jun 2022 12:03:56 +0000 (15:03 +0300)
committerJakub Kicinski <kuba@kernel.org>
Fri, 10 Jun 2022 15:36:08 +0000 (08:36 -0700)
Since platform_device_unregister() is NULL-aware, we don't need to duplicate
this check. Remove it and fold the rest of the code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Vadim Fedorenko <vfedorenko@novek.ru>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/ptp/ptp_ocp.c

index c8dea4c89bc27b623a558e1a78ba00f8207362ad..62c628ded9eeba6d7b23d9741820a693a54745f4 100644 (file)
@@ -3701,10 +3701,8 @@ ptp_ocp_detach(struct ptp_ocp *bp)
                serial8250_unregister_port(bp->mac_port);
        if (bp->nmea_port != -1)
                serial8250_unregister_port(bp->nmea_port);
-       if (bp->spi_flash)
-               platform_device_unregister(bp->spi_flash);
-       if (bp->i2c_ctrl)
-               platform_device_unregister(bp->i2c_ctrl);
+       platform_device_unregister(bp->spi_flash);
+       platform_device_unregister(bp->i2c_ctrl);
        if (bp->i2c_clk)
                clk_hw_unregister_fixed_rate(bp->i2c_clk);
        if (bp->n_irqs)