We are adding a helper module macro for removing boilerplate code in driver registration, and removing redundant context argument from the event callback. The changes go over misc, nfc, and watchdog subtrees. I believe it should be conflict free to merge it to the misc tree. Tomas Winkler (5): mei: bus: add module_mei_cl_driver helper macro watchdog: mei_wdt: use module_mei_cl_driver macro nfc: mei: use module_mei_cl_driver macro nfc: mei_phy: get phy from the driver data mei: bus: remove rx callback context drivers/misc/mei/bus.c | 6 ++---- drivers/nfc/mei_phy.c | 10 ++++++---- drivers/nfc/microread/mei.c | 23 +---------------------- drivers/nfc/pn544/mei.c | 23 +---------------------- drivers/watchdog/mei_wdt.c | 26 +++----------------------- include/linux/mei_cl_bus.h | 19 +++++++++++++++---- 6 files changed, 28 insertions(+), 79 deletions(-) -- 2.7.4