[PATCH v3 08/11] firmware: raspberrypi: Get rid of rpi_firmware_get()
From: Nicolas Saenz Julienne <hidden>
Date: 2020-11-04 10:40:37
Also in:
linux-arm-kernel, linux-clk, linux-devicetree, linux-gpio, linux-pwm, lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
There a no users left to the function as they all converted to devm_rpi_firmware_get(). Just get rid of it. Signed-off-by: Nicolas Saenz Julienne <redacted> --- drivers/firmware/raspberrypi.c | 17 ----------------- include/soc/bcm2835/raspberrypi-firmware.h | 6 ------ 2 files changed, 23 deletions(-)
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
index 74bdb3bde9dc..67f7105f3fd2 100644
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c@@ -297,23 +297,6 @@ static void rpi_firmware_put(void *data) wake_up(&fw->wait); } -/** - * rpi_firmware_get - Get pointer to rpi_firmware structure. - * @firmware_node: Pointer to the firmware Device Tree node. - * - * Returns NULL is the firmware device is not ready. - */ -struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node) -{ - struct platform_device *pdev = of_find_device_by_node(firmware_node); - - if (!pdev) - return NULL; - - return platform_get_drvdata(pdev); -} -EXPORT_SYMBOL_GPL(rpi_firmware_get); - /** * devm_rpi_firmware_get - Get pointer to rpi_firmware structure. * @firmware_node: Pointer to the firmware Device Tree node.
diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
index 8fe64f53a394..eaa4e516e4c6 100644
--- a/include/soc/bcm2835/raspberrypi-firmware.h
+++ b/include/soc/bcm2835/raspberrypi-firmware.h@@ -140,7 +140,6 @@ int rpi_firmware_property(struct rpi_firmware *fw, u32 tag, void *data, size_t len); int rpi_firmware_property_list(struct rpi_firmware *fw, void *data, size_t tag_size); -struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node); struct rpi_firmware *devm_rpi_firmware_get(struct device *dev, struct device_node *firmware_node); #else
@@ -156,11 +155,6 @@ static inline int rpi_firmware_property_list(struct rpi_firmware *fw, return -ENOSYS; } -static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node) -{ - return NULL; -} - static inline struct rpi_firmware *devm_rpi_firmware_get(struct device *dev, struct device_node *firmware_node) {
--
2.29.1