]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
spi: drop unused devres statistics allocation
authorJohan Hovold <johan@kernel.org>
Thu, 12 Mar 2026 15:18:15 +0000 (16:18 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 16 Mar 2026 18:36:04 +0000 (18:36 +0000)
Drop the now unused device managed per-cpu statistics allocation.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260312151817.32100-4-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi.c

index 53dee314d76ae91f37f2f137fcf7bc2fad69a381..bfc42b75549a2555ad234e428af197d146c8300b 100644 (file)
@@ -96,25 +96,22 @@ static ssize_t driver_override_show(struct device *dev,
 }
 static DEVICE_ATTR_RW(driver_override);
 
-static struct spi_statistics __percpu *spi_alloc_pcpu_stats(struct device *dev)
+static struct spi_statistics __percpu *spi_alloc_pcpu_stats(void)
 {
        struct spi_statistics __percpu *pcpu_stats;
+       int cpu;
 
-       if (dev)
-               pcpu_stats = devm_alloc_percpu(dev, struct spi_statistics);
-       else
-               pcpu_stats = alloc_percpu_gfp(struct spi_statistics, GFP_KERNEL);
-
-       if (pcpu_stats) {
-               int cpu;
+       pcpu_stats = alloc_percpu_gfp(struct spi_statistics, GFP_KERNEL);
+       if (!pcpu_stats)
+               return NULL;
 
-               for_each_possible_cpu(cpu) {
-                       struct spi_statistics *stat;
+       for_each_possible_cpu(cpu) {
+               struct spi_statistics *stat;
 
-                       stat = per_cpu_ptr(pcpu_stats, cpu);
-                       u64_stats_init(&stat->syncp);
-               }
+               stat = per_cpu_ptr(pcpu_stats, cpu);
+               u64_stats_init(&stat->syncp);
        }
+
        return pcpu_stats;
 }
 
@@ -574,7 +571,7 @@ struct spi_device *spi_alloc_device(struct spi_controller *ctlr)
                return NULL;
        }
 
-       spi->pcpu_statistics = spi_alloc_pcpu_stats(NULL);
+       spi->pcpu_statistics = spi_alloc_pcpu_stats();
        if (!spi->pcpu_statistics) {
                kfree(spi);
                spi_controller_put(ctlr);
@@ -3194,7 +3191,7 @@ struct spi_controller *__spi_alloc_controller(struct device *dev,
        if (!ctlr)
                return NULL;
 
-       ctlr->pcpu_statistics = spi_alloc_pcpu_stats(NULL);
+       ctlr->pcpu_statistics = spi_alloc_pcpu_stats();
        if (!ctlr->pcpu_statistics) {
                kfree(ctlr);
                return NULL;