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

Commit 83fbae5a authored by Neil Armstrong's avatar Neil Armstrong Committed by Wim Van Sebroeck
Browse files

watchdog: Add a device managed API for watchdog_register_device() 



This helps in reducing code in .remove callbacks and sometimes
dropping .remove callbacks entirely.

Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 47ef4ad2

Documentation/driver-model/devres.txt

+3 −0
Original line number Diff line number Diff line
@@ -357,3 +357,6 @@ SLAVE DMA ENGINE 


SPI

  devm_spi_register_master()



WATCHDOG

  devm_watchdog_register_device()

drivers/watchdog/watchdog_core.c

+37 −0
Original line number Diff line number Diff line
@@ -329,6 +329,43 @@ void watchdog_unregister_device(struct watchdog_device *wdd) 


EXPORT_SYMBOL_GPL(watchdog_unregister_device);



static void devm_watchdog_unregister_device(struct device *dev, void *res)

{

	watchdog_unregister_device(*(struct watchdog_device **)res);

}



/**

 * devm_watchdog_register_device() - resource managed watchdog_register_device()

 * @dev: device that is registering this watchdog device

 * @wdd: watchdog device

 *

 * Managed watchdog_register_device(). For watchdog device registered by this

 * function,  watchdog_unregister_device() is automatically called on driver

 * detach. See watchdog_register_device() for more information.

 */

int devm_watchdog_register_device(struct device *dev,

				struct watchdog_device *wdd)

{

	struct watchdog_device **rcwdd;

	int ret;



	rcwdd = devres_alloc(devm_watchdog_unregister_device, sizeof(*wdd),

			     GFP_KERNEL);

	if (!rcwdd)

		return -ENOMEM;



	ret = watchdog_register_device(wdd);

	if (!ret) {

		*rcwdd = wdd;

		devres_add(dev, rcwdd);

	} else {

		devres_free(rcwdd);

	}



	return ret;

}

EXPORT_SYMBOL_GPL(devm_watchdog_register_device);



static int __init watchdog_deferred_registration(void)

{

	mutex_lock(&wtd_deferred_reg_mutex);

include/linux/watchdog.h

+3 −0
Original line number Diff line number Diff line
@@ -180,4 +180,7 @@ extern int watchdog_init_timeout(struct watchdog_device *wdd, 
extern int watchdog_register_device(struct watchdog_device *);

extern void watchdog_unregister_device(struct watchdog_device *);



/* devres register variant */

int devm_watchdog_register_device(struct device *dev, struct watchdog_device *);



#endif  /* ifndef _LINUX_WATCHDOG_H */