diff mbox series

[v2] memory: omap-gpmc: deadcode a pair of functions

Message ID 20241211214227.107980-1-linux@treblig.org
State New
Headers show
Series [v2] memory: omap-gpmc: deadcode a pair of functions | expand

Commit Message

Dr. David Alan Gilbert Dec. 11, 2024, 9:42 p.m. UTC 
From: "Dr. David Alan Gilbert" <linux@treblig.org>

gpmc_get_client_irq() last use was removed by
commit ac28e47ccc3f ("ARM: OMAP2+: Remove legacy gpmc-nand.c")

gpmc_ticks_to_ns() last use was removed by
commit 2514830b8b8c ("ARM: OMAP2+: Remove gpmc-onenand")

Remove them.

gpmc_clk_ticks_to_ns() is now only used in some DEBUG
code; move inside the ifdef to avoid unused warnings.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
 drivers/memory/omap-gpmc.c | 33 +++++++--------------------------
 include/linux/omap-gpmc.h  |  4 ----
 2 files changed, 7 insertions(+), 30 deletions(-)

Comments

Kevin Hilman Dec. 13, 2024, 4:45 p.m. UTC | #1 
On Wed, 11 Dec 2024 21:42:27 +0000, linux@treblig.org wrote:
> gpmc_get_client_irq() last use was removed by
> commit ac28e47ccc3f ("ARM: OMAP2+: Remove legacy gpmc-nand.c")
> 
> gpmc_ticks_to_ns() last use was removed by
> commit 2514830b8b8c ("ARM: OMAP2+: Remove gpmc-onenand")
> 
> Remove them.
> 
> [...]

Applied, thanks!

[1/1] memory: omap-gpmc: deadcode a pair of functions
      commit: 56d96fc5539003a95b8ab631a4ebb5d1b0a24885

Best regards,
Kevin Hilman Dec. 13, 2024, 5:14 p.m. UTC | #2 
Krzysztof Kozlowski <krzk@kernel.org> writes:

> On 13/12/2024 17:45, Kevin Hilman wrote:
>> 
>> On Wed, 11 Dec 2024 21:42:27 +0000, linux@treblig.org wrote:
>>> gpmc_get_client_irq() last use was removed by
>>> commit ac28e47ccc3f ("ARM: OMAP2+: Remove legacy gpmc-nand.c")
>>>
>>> gpmc_ticks_to_ns() last use was removed by
>>> commit 2514830b8b8c ("ARM: OMAP2+: Remove gpmc-onenand")
>>>
>>> Remove them.
>>>
>>> [...]
>> 
>> Applied, thanks!
>> 
>> [1/1] memory: omap-gpmc: deadcode a pair of functions
>>       commit: 56d96fc5539003a95b8ab631a4ebb5d1b0a24885
>
> This should not go via soc tree, it's memory.
>

Indeed, thanks for catching.  That's what I get for trying to
review/apply patches first thing in the moring.

I dropped it from my tree, sorry for the noise.

What should've said was simply

Acked-by: Kevin Hilman <khilman@baylibre.com>

Kevin
diff mbox series

Patch

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 50eb9f49512b..e2a75a52563f 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -358,17 +358,6 @@  static unsigned int gpmc_ps_to_ticks(unsigned int time_ps)
 	return (time_ps + tick_ps - 1) / tick_ps;
 }
 
-static unsigned int gpmc_clk_ticks_to_ns(unsigned int ticks, int cs,
-					 enum gpmc_clk_domain cd)
-{
-	return ticks * gpmc_get_clk_period(cs, cd) / 1000;
-}
-
-unsigned int gpmc_ticks_to_ns(unsigned int ticks)
-{
-	return gpmc_clk_ticks_to_ns(ticks, /* any CS */ 0, GPMC_CD_FCLK);
-}
-
 static unsigned int gpmc_ticks_to_ps(unsigned int ticks)
 {
 	return ticks * gpmc_get_fclk_period();
@@ -415,6 +404,13 @@  static void gpmc_cs_bool_timings(int cs, const struct gpmc_bool_timings *p)
 }
 
 #ifdef CONFIG_OMAP_GPMC_DEBUG
+
+static unsigned int gpmc_clk_ticks_to_ns(unsigned int ticks, int cs,
+					 enum gpmc_clk_domain cd)
+{
+	return ticks * gpmc_get_clk_period(cs, cd) / 1000;
+}
+
 /**
  * get_gpmc_timing_reg - read a timing parameter and print DTS settings for it.
  * @cs:      Chip Select Region
@@ -1295,21 +1291,6 @@  int gpmc_omap_onenand_set_timings(struct device *dev, int cs, int freq,
 }
 EXPORT_SYMBOL_GPL(gpmc_omap_onenand_set_timings);
 
-int gpmc_get_client_irq(unsigned int irq_config)
-{
-	if (!gpmc_irq_domain) {
-		pr_warn("%s called before GPMC IRQ domain available\n",
-			__func__);
-		return 0;
-	}
-
-	/* we restrict this to NAND IRQs only */
-	if (irq_config >= GPMC_NR_NAND_IRQS)
-		return 0;
-
-	return irq_create_mapping(gpmc_irq_domain, irq_config);
-}
-
 static int gpmc_irq_endis(unsigned long hwirq, bool endis)
 {
 	u32 regval;
diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h
index c9e3843d2dd5..263b915df1fb 100644
--- a/include/linux/omap-gpmc.h
+++ b/include/linux/omap-gpmc.h
@@ -66,10 +66,6 @@  extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t,
 
 struct device_node;
 
-extern int gpmc_get_client_irq(unsigned irq_config);
-
-extern unsigned int gpmc_ticks_to_ns(unsigned int ticks);
-
 extern void gpmc_cs_write_reg(int cs, int idx, u32 val);
 extern int gpmc_calc_divider(unsigned int sync_clk);
 extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t,