Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de85be00 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

firmware: raspberrypi: Introduce devm_rpi_firmware_get() 



[ Upstream commit f663204c9a1f8d6fcc590667d9d7a9f44e064644 ]

It'll simplify the firmware handling for most consumers.

Suggested-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Stable-dep-of: 5bca3688bdbc ("Input: raspberrypi-ts - fix refcount leak in rpi_ts_probe")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d537afa0

drivers/firmware/raspberrypi.c

+29 −0
Original line number Diff line number Diff line
@@ -232,6 +232,13 @@ void rpi_firmware_put(struct rpi_firmware *fw) 
}

EXPORT_SYMBOL_GPL(rpi_firmware_put);



static void devm_rpi_firmware_put(void *data)

{

	struct rpi_firmware *fw = data;



	rpi_firmware_put(fw);

}



static int rpi_firmware_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -320,6 +327,28 @@ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node) 
}

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.

 *

 * Returns NULL is the firmware device is not ready.

 */

struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,

					   struct device_node *firmware_node)

{

	struct rpi_firmware *fw;



	fw = rpi_firmware_get(firmware_node);

	if (!fw)

		return NULL;



	if (devm_add_action_or_reset(dev, devm_rpi_firmware_put, fw))

		return NULL;



	return fw;

}

EXPORT_SYMBOL_GPL(devm_rpi_firmware_get);



static const struct of_device_id rpi_firmware_of_match[] = {

	{ .compatible = "raspberrypi,bcm2835-firmware", },

	{},

include/soc/bcm2835/raspberrypi-firmware.h

+8 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ int rpi_firmware_property_list(struct rpi_firmware *fw, 
			       void *data, size_t tag_size);

void rpi_firmware_put(struct rpi_firmware *fw);

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

static inline int rpi_firmware_property(struct rpi_firmware *fw, u32 tag,

					void *data, size_t len)
@@ -160,6 +162,12 @@ static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware 
{

	return NULL;

}



static inline struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,

					struct device_node *firmware_node)

{

	return NULL;

}

#endif



#endif /* __SOC_RASPBERRY_FIRMWARE_H__ */