From 04c45933e87cca8ec6d67cbc22a008e8f12e3569 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Tue, 13 Jan 2026 14:44:26 +0000 Subject: [PATCH] firmware: get rid of unused "xxx_sleep()" storage driver function storage_sleepnow() is the one that is actually implemented by storage drivers. storage_sleep() sends a Q_STORAGE_SLEEP event to the storage thread, which will normally end up calling the driver's sleepnow() function. Change-Id: Ib6523073348431dcc75c0f10ef99060c6960efd8 --- firmware/drivers/ramdisk.c | 4 ---- firmware/drivers/sd.c | 4 ---- firmware/export/ata.h | 1 - firmware/export/mmc.h | 1 - firmware/export/nand.h | 1 - firmware/export/ramdisk.h | 1 - firmware/export/sd.h | 1 - firmware/target/arm/ata-nand-telechips.c | 4 ---- firmware/target/arm/imx233/sdmmc-imx233.c | 4 ---- firmware/target/arm/rk27xx/ata-nand-rk27xx.c | 5 ----- firmware/target/arm/s5l8700/ata-nand-s5l8700.c | 4 ---- firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c | 5 ----- firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c | 5 ----- 13 files changed, 40 deletions(-) diff --git a/firmware/drivers/ramdisk.c b/firmware/drivers/ramdisk.c index 5798de252e..edcf5cba4e 100644 --- a/firmware/drivers/ramdisk.c +++ b/firmware/drivers/ramdisk.c @@ -74,10 +74,6 @@ long ramdisk_last_disk_activity(void) return last_disk_activity; } -void ramdisk_sleep(void) -{ -} - void ramdisk_spin(void) { } diff --git a/firmware/drivers/sd.c b/firmware/drivers/sd.c index 521bdfbdd0..2a6373b56c 100644 --- a/firmware/drivers/sd.c +++ b/firmware/drivers/sd.c @@ -23,10 +23,6 @@ #include "sdmmc.h" #include "storage.h" -void sd_sleep(void) -{ -} - void sd_spin(void) { } diff --git a/firmware/export/ata.h b/firmware/export/ata.h index cef5dce613..0ab504c7e3 100644 --- a/firmware/export/ata.h +++ b/firmware/export/ata.h @@ -132,7 +132,6 @@ struct storage_info; void ata_enable(bool on); void ata_spindown(int seconds); -void ata_sleep(void); void ata_sleepnow(void); /* NOTE: DO NOT use this to poll for disk activity. If you are waiting for the disk to become active before diff --git a/firmware/export/mmc.h b/firmware/export/mmc.h index 06df979b81..1d5e3393e5 100644 --- a/firmware/export/mmc.h +++ b/firmware/export/mmc.h @@ -30,7 +30,6 @@ struct storage_info; void mmc_enable(bool on); void mmc_spindown(int seconds); -void mmc_sleep(void); void mmc_sleepnow(void); bool mmc_disk_is_active(void); int mmc_soft_reset(void); diff --git a/firmware/export/nand.h b/firmware/export/nand.h index d4fd6028ed..6f9f504c44 100644 --- a/firmware/export/nand.h +++ b/firmware/export/nand.h @@ -30,7 +30,6 @@ struct storage_info; void nand_enable(bool on); void nand_spindown(int seconds); -void nand_sleep(void); void nand_sleepnow(void); bool nand_disk_is_active(void); int nand_soft_reset(void); diff --git a/firmware/export/ramdisk.h b/firmware/export/ramdisk.h index eb06ea9650..8e3baf8e3e 100644 --- a/firmware/export/ramdisk.h +++ b/firmware/export/ramdisk.h @@ -30,7 +30,6 @@ struct storage_info; void ramdisk_enable(bool on); void ramdisk_spindown(int seconds); -void ramdisk_sleep(void); bool ramdisk_disk_is_active(void); int ramdisk_soft_reset(void); int ramdisk_init(void) STORAGE_INIT_ATTR; diff --git a/firmware/export/sd.h b/firmware/export/sd.h index d66e6f899c..01ad760f86 100644 --- a/firmware/export/sd.h +++ b/firmware/export/sd.h @@ -36,7 +36,6 @@ struct storage_info; void sd_enable(bool on); void sd_spindown(int seconds); -void sd_sleep(void); void sd_sleepnow(void); bool sd_disk_is_active(void); int sd_soft_reset(void); diff --git a/firmware/target/arm/ata-nand-telechips.c b/firmware/target/arm/ata-nand-telechips.c index 453a51ed1b..49fbedff76 100644 --- a/firmware/target/arm/ata-nand-telechips.c +++ b/firmware/target/arm/ata-nand-telechips.c @@ -1010,10 +1010,6 @@ long nand_last_disk_activity(void) return last_disk_activity; } -void nand_sleep(void) -{ -} - void nand_spin(void) { } diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c index 02f59a50f4..65f253de1e 100644 --- a/firmware/target/arm/imx233/sdmmc-imx233.c +++ b/firmware/target/arm/imx233/sdmmc-imx233.c @@ -1000,10 +1000,6 @@ void mmc_enable(bool on) (void) on; } -void mmc_sleepnow(void) -{ -} - bool mmc_disk_is_active(void) { return false; diff --git a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c index 74b468a851..5cbc67f837 100644 --- a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c +++ b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c @@ -56,11 +56,6 @@ void nand_spindown(int seconds) (void)seconds; } -void nand_sleep(void) -{ - nand_power_down(); -} - void nand_sleepnow(void) { nand_power_down(); diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c index 34a1c46043..5ca467f7f8 100644 --- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c +++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c @@ -50,10 +50,6 @@ void nand_spindown(int seconds) (void)seconds; } -void nand_sleep(void) -{ -} - void nand_sleepnow(void) { nand_power_down(); diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c index 77fd5c013b..3187c28952 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c @@ -695,11 +695,6 @@ void nand_spindown(int seconds) (void)seconds; } -void nand_sleep(void) -{ - /* null */ -} - void nand_spin(void) { /* null */ diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c index ff9b7e419e..9189450794 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c @@ -630,11 +630,6 @@ void nand_spindown(int seconds) (void)seconds; } -void nand_sleep(void) -{ - /* null */ -} - void nand_spin(void) { /* null */