diff options
| author | Hongguang Chen <hgchen@google.com> | 2021-07-06 23:54:48 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2021-07-06 23:54:48 +0000 |
| commit | a2ceec87606934b3dca6760b3890565276f00c3c (patch) | |
| tree | b3443b0e05b72e542ae8ff00f19d2cf5aa5cc88d | |
| parent | fddecb4b1dab102ff0c3c4a4137af1978e45395b (diff) | |
| parent | 2eb38c8c59c640ae35d7c7e96028b5def3148db6 (diff) | |
| download | arm64-a2ceec87606934b3dca6760b3890565276f00c3c.tar.gz | |
Merge "cec: fix complie issue [1/1]" into android-tv-deadpool-4.9-android12
| -rw-r--r-- | drivers/amlogic/cec/hdmi_ao_cec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/amlogic/cec/hdmi_ao_cec.c b/drivers/amlogic/cec/hdmi_ao_cec.c index 2d10717db4da..0536cf3546e7 100644 --- a/drivers/amlogic/cec/hdmi_ao_cec.c +++ b/drivers/amlogic/cec/hdmi_ao_cec.c @@ -279,11 +279,13 @@ static struct cec_uevent cec_events[] = { } }; +#ifdef CONFIG_AMLOGIC_HDMITX static int hdmitx_notify_callback(struct notifier_block *block, unsigned long cmd, void *para); static struct notifier_block hdmitx_notifier_nb = { .notifier_call = hdmitx_notify_callback }; +#endif unsigned int waiting_aocec_free(unsigned int r) { @@ -4021,20 +4023,19 @@ static void cec_rx_uevent_handler(struct work_struct *work) cec_set_uevent(CEC_RX_MSG, 0); } +#ifdef CONFIG_AMLOGIC_HDMITX static int hdmitx_notify_callback(struct notifier_block *block, unsigned long cmd, void *para) { int ret = 0; switch (cmd) { -#ifdef CONFIG_AMLOGIC_HDMITX case HDMITX_PLUG: case HDMITX_UNPLUG: CEC_INFO("[%s] event: %ld\n", __func__, cmd); queue_delayed_work(cec_dev->hdmi_plug_wq, &cec_dev->work_hdmi_plug, 0); break; -#endif default: CEC_ERR("[%s] unsupported notify:%ld\n", __func__, cmd); ret = -EINVAL; @@ -4042,6 +4043,7 @@ static int hdmitx_notify_callback(struct notifier_block *block, } return ret; } +#endif #ifdef CONFIG_AMLOGIC_MEDIA_TVIN_HDMI static int hdmirx_notify_callback(unsigned int pwr5v_sts) |