spi: rockchip: Perform trivial code cleanups

Perform a few trivial code cleanups, to obey the reverse Christmas tree rule,
to avoid unnecessary line wrapping by using the 100-column width better, to
actually obey the 100-column width in one case, and to make the way a couple
of wrapped function arguments are indented a bit more readable.

No intended functional changes are introduced by these code cleanups.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patch.msgid.link/663ec6bb472ab83bb5824a09d11b36ef20a43fc7.1727337732.git.dsimic@manjaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 0bb33c43b1b46e3397e6b507f116d5a34a7b452d..81046f7b75915f3ad1ad01a73a0309596bf26a23 100644 (file)
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -742,22 +742,20 @@ static int rockchip_spi_setup(struct spi_device *spi)
 
 static int rockchip_spi_probe(struct platform_device *pdev)
 {
-       int ret;
-       struct rockchip_spi *rs;
+       struct device_node *np = pdev->dev.of_node;
        struct spi_controller *ctlr;
+       struct rockchip_spi *rs;
        struct resource *mem;
-       struct device_node *np = pdev->dev.of_node;
        u32 rsd_nsecs, num_cs;
        bool target_mode;
+       int ret;
 
        target_mode = of_property_read_bool(np, "spi-slave");
 
        if (target_mode)
-               ctlr = spi_alloc_target(&pdev->dev,
-                               sizeof(struct rockchip_spi));
+               ctlr = spi_alloc_target(&pdev->dev, sizeof(struct rockchip_spi));
        else
-               ctlr = spi_alloc_host(&pdev->dev,
-                               sizeof(struct rockchip_spi));
+               ctlr = spi_alloc_host(&pdev->dev, sizeof(struct rockchip_spi));
 
        if (!ctlr)
                return -ENOMEM;
@@ -769,7 +767,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
        /* Get basic io resource and map it */
        rs->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &mem);
        if (IS_ERR(rs->regs)) {
-               ret =  PTR_ERR(rs->regs);
+               ret = PTR_ERR(rs->regs);
                goto err_put_ctlr;
        }
 
@@ -794,7 +792,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
                goto err_put_ctlr;
 
        ret = devm_request_threaded_irq(&pdev->dev, ret, rockchip_spi_isr, NULL,
-                       IRQF_ONESHOT, dev_name(&pdev->dev), ctlr);
+                                       IRQF_ONESHOT, dev_name(&pdev->dev), ctlr);
        if (ret)
                goto err_put_ctlr;
 
@@ -804,16 +802,15 @@ static int rockchip_spi_probe(struct platform_device *pdev)
        if (!of_property_read_u32(pdev->dev.of_node, "rx-sample-delay-ns",
                                  &rsd_nsecs)) {
                /* rx sample delay is expressed in parent clock cycles (max 3) */
-               u32 rsd = DIV_ROUND_CLOSEST(rsd_nsecs * (rs->freq >> 8),
-                               1000000000 >> 8);
+               u32 rsd = DIV_ROUND_CLOSEST(rsd_nsecs * (rs->freq >> 8), 1000000000 >> 8);
                if (!rsd) {
                        dev_warn(rs->dev, "%u Hz are too slow to express %u ns delay\n",
-                                       rs->freq, rsd_nsecs);
+                                rs->freq, rsd_nsecs);
                } else if (rsd > CR0_RSD_MAX) {
                        rsd = CR0_RSD_MAX;
-                       dev_warn(rs->dev, "%u Hz are too fast to express %u ns delay, clamping at %u ns\n",
-                                       rs->freq, rsd_nsecs,
-                                       CR0_RSD_MAX * 1000000000U / rs->freq);
+                       dev_warn(rs->dev,
+                                "%u Hz are too fast to express %u ns delay, clamping at %u ns\n",
+                                rs->freq, rsd_nsecs, CR0_RSD_MAX * 1000000000U / rs->freq);
                }
                rs->rsd = rsd;
        }