aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/cec-notifier.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-07-24 16:51:18 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-07-24 16:51:18 -0700
commit53a7ff8fb785839b87f950fd85433d9c662fac89 (patch)
tree119840a23e5226d3f258e2309b4ef1d328535dd2 /include/media/cec-notifier.h
parentInput: sur40 - skip all blobs that are not touches (diff)
parentInput: axp20x-pek - switch to using devm_device_add_group() (diff)
downloadlinux-dev-53a7ff8fb785839b87f950fd85433d9c662fac89.tar.xz
linux-dev-53a7ff8fb785839b87f950fd85433d9c662fac89.zip
Merge branch 'bind_unbind' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into next
This brings in devm_device_add_group() and friends so that we can create driver-specific device attributes as managed resources.
Diffstat (limited to 'include/media/cec-notifier.h')
-rw-r--r--include/media/cec-notifier.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/media/cec-notifier.h b/include/media/cec-notifier.h
index eb50ce54b759..298f996969df 100644
--- a/include/media/cec-notifier.h
+++ b/include/media/cec-notifier.h
@@ -29,7 +29,7 @@ struct edid;
struct cec_adapter;
struct cec_notifier;
-#ifdef CONFIG_MEDIA_CEC_NOTIFIER
+#if IS_REACHABLE(CONFIG_CEC_CORE) && IS_ENABLED(CONFIG_CEC_NOTIFIER)
/**
* cec_notifier_get - find or create a new cec_notifier for the given device.
@@ -106,6 +106,16 @@ static inline void cec_notifier_set_phys_addr_from_edid(struct cec_notifier *n,
{
}
+static inline void cec_notifier_register(struct cec_notifier *n,
+ struct cec_adapter *adap,
+ void (*callback)(struct cec_adapter *adap, u16 pa))
+{
+}
+
+static inline void cec_notifier_unregister(struct cec_notifier *n)
+{
+}
+
#endif
#endif