Merge tag 'media/v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - new Mediatek drivers: mtk-mdp and mtk-vcodec

 - some additions at the media documentation

 - the CEC core and drivers were promoted from staging to mainstream

 - some cleanups at the DVB core

 - the LIRC serial driver got promoted from staging to mainstream

 - added a driver for Renesas R-Car FDP1 driver

 - add DVBv5 statistics support to mn88473 driver

 - several fixes related to printk continuation lines

 - add support for HSV encoding formats

 - lots of other cleanups, fixups and driver improvements.

* tag 'media/v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (496 commits)
  [media] v4l: tvp5150: Add missing break in set control handler
  [media] v4l: tvp5150: Don't inline the tvp5150_selmux() function
  [media] v4l: tvp5150: Compile tvp5150_link_setup out if !CONFIG_MEDIA_CONTROLLER
  [media] em28xx: don't store usb_device at struct em28xx
  [media] em28xx: use usb_interface for dev_foo() calls
  [media] em28xx: don't change the device's name
  [media] mn88472: fix chip id check on probe
  [media] mn88473: fix chip id check on probe
  [media] lirc: fix error paths in lirc_cdev_add()
  [media] s5p-mfc: Add support for MFC v8 available in Exynos 5433 SoCs
  [media] s5p-mfc: Rework clock handling
  [media] s5p-mfc: Don't keep clock prepared all the time
  [media] s5p-mfc: Kill all IS_ERR_OR_NULL in clocks management code
  [media] s5p-mfc: Remove dead conditional code
  [media] s5p-mfc: Ensure that clock is disabled before turning power off
  [media] s5p-mfc: Remove special clock rate management
  [media] s5p-mfc: Use printk_ratelimited for reporting ioctl errors
  [media] s5p-mfc: Set DMA_ATTR_ALLOC_SINGLE_PAGES
  [media] vivid: Set color_enc on HSV formats
  [media] v4l2-tpg: Init hv_enc field with a valid value
  ...

2 files changed, 0 insertions, 2985 deletions

diff --git a/include/linux/cec-funcs.h b/include/linux/cec-funcs.h
deleted file mode 100644
index 138bbf721e70..000000000000
--- a/include/linux/cec-funcs.h
+++ /dev/null
@@ -1,1971 +0,0 @@
-/*
- * cec - HDMI Consumer Electronics Control message functions
- *
- * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
- *
- * This program is free software; you may redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * Alternatively you can redistribute this file under the terms of the
- * BSD license as stated below:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. The names of its contributors may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * Note: this framework is still in staging and it is likely the API
- * will change before it goes out of staging.
- *
- * Once it is moved out of staging this header will move to uapi.
- */
-#ifndef _CEC_UAPI_FUNCS_H
-#define _CEC_UAPI_FUNCS_H
-
-#include <linux/cec.h>
-
-/* One Touch Play Feature */
-static inline void cec_msg_active_source(struct cec_msg *msg, __u16 phys_addr)
-{
-	msg->len = 4;
-	msg->msg[0] |= 0xf; /* broadcast */
-	msg->msg[1] = CEC_MSG_ACTIVE_SOURCE;
-	msg->msg[2] = phys_addr >> 8;
-	msg->msg[3] = phys_addr & 0xff;
-}
-
-static inline void cec_ops_active_source(const struct cec_msg *msg,
-					 __u16 *phys_addr)
-{
-	*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
-}
-
-static inline void cec_msg_image_view_on(struct cec_msg *msg)
-{
-	msg->len = 2;
-	msg->msg[1] = CEC_MSG_IMAGE_VIEW_ON;
-}
-
-static inline void cec_msg_text_view_on(struct cec_msg *msg)
-{
-	msg->len = 2;
-	msg->msg[1] = CEC_MSG_TEXT_VIEW_ON;
-}
-
-
-/* Routing Control Feature */
-static inline void cec_msg_inactive_source(struct cec_msg *msg,
-					   __u16 phys_addr)
-{
-	msg->len = 4;
-	msg->msg[1] = CEC_MSG_INACTIVE_SOURCE;
-	msg->msg[2] = phys_addr >> 8;
-	msg->msg[3] = phys_addr & 0xff;
-}
-
-static inline void cec_ops_inactive_source(const struct cec_msg *msg,
-					   __u16 *phys_addr)
-{
-	*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
-}
-
-static inline void cec_msg_request_active_source(struct cec_msg *msg,
-						 bool reply)
-{
-	msg->len = 2;
-	msg->msg[0] |= 0xf; /* broadcast */
-	msg->msg[1] = CEC_MSG_REQUEST_ACTIVE_SOURCE;
-	msg->reply = reply ? CEC_MSG_ACTIVE_SOURCE : 0;
-}
-
-static inline void cec_msg_routing_information(struct cec_msg *msg,
-					       __u16 phys_addr)
-{
-	msg->len = 4;
-	msg->msg[0] |= 0xf; /* broadcast */
-	msg->msg[1] = CEC_MSG_ROUTING_INFORMATION;
-	msg->msg[2] = phys_addr >> 8;
-	msg->msg[3] = phys_addr & 0xff;
-}
-
-static inline void cec_ops_routing_information(const struct cec_msg *msg,
-					       __u16 *phys_addr)
-{
-	*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
-}
-
-static inline void cec_msg_routing_change(struct cec_msg *msg,
-					  bool reply,
-					  __u16 orig_phys_addr,
-					  __u16 new_phys_addr)
-{
-	msg->len = 6;
-	msg->msg[0] |= 0xf; /* broadcast */
-	msg->msg[1] = CEC_MSG_ROUTING_CHANGE;
-	msg->msg[2] = orig_phys_addr >> 8;
-	msg->msg[3] = orig_phys_addr & 0xff;
-	msg->msg[4] = new_phys_addr >> 8;
-	msg->msg[5] = new_phys_addr & 0xff;
-	msg->reply = reply ? CEC_MSG_ROUTING_INFORMATION : 0;
-}
-
-static inline void cec_ops_routing_change(const struct cec_msg *msg,
-					  __u16 *orig_phys_addr,
-					  __u16 *new_phys_addr)
-{
-	*orig_phys_addr = (msg->msg[2] << 8) | msg->msg[3];
-	*new_phys_addr = (msg->msg[4] << 8) | msg->msg[5];
-}
-
-static inline void cec_msg_set_stream_path(struct cec_msg *msg, __u16 phys_addr)
-{
-	msg->len = 4;
-	msg->msg[0] |= 0xf; /* broadcast */
-	msg->msg[1] = CEC_MSG_SET_STREAM_PATH;
-	msg->msg[2] = phys_addr >> 8;
-	msg->msg[3] = phys_addr & 0xff;
-}
-
-static inline void cec_ops_set_stream_path(const struct cec_msg *msg,
-					   __u16 *phys_addr)
-{
-	*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
-}
-
-
-/* Standby Feature */
-static inline void cec_msg_standby(struct cec_msg *msg)
-{
-	msg->len = 2;
-	msg->msg[1] = CEC_MSG_STANDBY;
-}
-
-
-/* One Touch Record Feature */
-static inline void cec_msg_record_off(struct cec_msg *msg, bool reply)
-{
-	msg->len = 2;
-	msg->msg[1] = CEC_MSG_RECORD_OFF;
-	msg->reply = reply ? CEC_MSG_RECORD_STATUS : 0;
-}
-
-struct cec_op_arib_data {
-	__u16 transport_id;
-	__u16 service_id;
-	__u16 orig_network_id;
-};
-
-struct cec_op_atsc_data {
-	__u16 transport_id;
-	__u16 program_number;
-};
-
-struct cec_op_dvb_data {
-	__u16 transport_id;
-	__u16 service_id;
-	__u16 orig_network_id;
-};
-
-struct cec_op_channel_data {
-	__u8 channel_number_fmt;
-	__u16 major;
-	__u16 minor;
-};
-
-struct cec_op_digital_service_id {
-	__u8 service_id_method;
-	__u8 dig_bcast_system;
-	union {
-		struct cec_op_arib_data arib;
-		struct cec_op_atsc_data atsc;
-		struct cec_op_dvb_data dvb;
-		struct cec_op_channel_data channel;
-	};
-};
-
-struct cec_op_record_src {
-	__u8 type;
-	union {
-		struct cec_op_digital_service_id digital;
-		struct {
-			__u8 ana_bcast_type;
-			__u16 ana_freq;
-			__u8 bcast_system;
-		} analog;
-		struct {
-			__u8 plug;
-		} ext_plug;
-		struct {
-			__u16 phys_addr;
-		} ext_phys_addr;
-	};
-};
-
-static inline void cec_set_digital_service_id(__u8 *msg,
-	      const struct cec_op_digital_service_id *digital)
-{
-	*msg++ = (digital->service_id_method << 7) | digital->dig_bcast_system;
-	if (digital->service_id_method == CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL) {
-		*msg++ = (digital->channel.channel_number_fmt << 2) |
-			 (digital->channel.major >> 8);
-		*msg++ = digital->channel.major & 0xff;
-		*msg++ = digital->channel.minor >> 8;
-		*msg++ = digital->channel.minor & 0xff;
-		*msg++ = 0;
-		*msg++ = 0;
-		return;
-	}
-	switch (digital->dig_bcast_system) {
-	case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_GEN:
-	case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_CABLE:
-	case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_SAT:
-	case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_T:
-		*msg++ = digital->atsc.transport_id >> 8;
-		*msg++ = digital->atsc.transport_id & 0xff;
-		*msg++ = digital->atsc.program_number >> 8;
-		*msg++ = digital->atsc.program_number & 0xff;
-		*msg++ = 0;
-		*msg++ = 0;
-		break;
-	default:
-		*msg++ = digital->dvb.transport_id >> 8;
-		*msg++ = digital->dvb.transport_id & 0xff;
-		*msg++ = digital->dvb.service_id >> 8;
-		*msg++ = digital->dvb.service_id & 0xff;
-		*msg++ = digital->dvb.orig_network_id >> 8;
-		*msg++ = digital->dvb.orig_network_id & 0xff;
-		break;
-	}
-}
-
-static inline void cec_get_digital_service_id(const __u8 *msg,
-	      struct cec_op_digital_service_id *digital)
-{
-	digital->service_id_method = msg[0] >> 7;
-	digital->dig_bcast_system = msg[0] & 0x7f;
-	if (digital->service_id_method == CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL) {
-		digital->channel.channel_number_fmt = msg[1] >> 2;
-		digital->channel.major = ((msg[1] & 3) << 6) | msg[2];
-		digital->channel.minor = (msg[3] << 8) | msg[4];
-		return;
-	}
-	digital->dvb.transport_id = (msg[1] << 8) | msg[2];
-	digital->dvb.service_id = (msg[3] << 8) | msg[4];
-	digital->dvb.orig_network_id = (msg[5] << 8) | msg[6];
-}
-
-static inline void cec_msg_record_on_own(struct cec_msg *msg)
-{
-	msg->len = 3;
-	msg->msg[1] = CEC_MSG_RECORD_ON;
-	msg->msg[2] = CEC_OP_RECORD_SRC_OWN;
-}
-
-static inline void cec_msg_record_on_digital(struct cec_msg *msg,
-			     const struct cec_op_digital_service_id *digital)
-{
-	msg->len = 10;
-	msg->msg[1] = CEC_MSG_RECORD_ON;
-	msg->msg[2] = CEC_OP_RECORD_SRC_DIGITAL;
-	cec_set_digital_service_id(msg->msg + 3, digital);
-}
-
-static inline void cec_msg_record_on_analog(struct cec_msg *msg,
-					    __u8 ana_bcast_type,
-					    __u16 ana_freq,
-					    __u8 bcast_system)
-{
-	msg->len = 7;
-	msg->msg[1] = CEC_MSG_RECORD_ON;
-	msg->msg[2] = CEC_OP_RECORD_SRC_ANALOG;
-	msg->msg[3] = ana_bcast_type;
-	msg->msg[4] = ana_freq >> 8;
-	msg->msg[5] = ana_freq & 0xff;
-	msg->msg[6] = bcast_system;
-}
-
-static inline void cec_msg_record_on_plug(struct cec_msg *msg,
-					  __u8 plug)
-{
-	msg->len = 4;
-	msg->msg[1] = CEC_MSG_RECORD_ON;
-	msg->msg[2] = CEC_OP_RECORD_SRC_EXT_PLUG;
-	msg->msg[3] = plug;
-}
-
-static inline void cec_msg_record_on_phys_addr(struct cec_msg *msg,
-					       __u16 phys_addr)
-{
-	msg->len = 5;
-	msg->msg[1] = CEC_MSG_RECORD_ON;
-	msg->msg[2] = CEC_OP_RECORD_SRC_EXT_PHYS_ADDR;
-	msg->msg[3] = phys_addr >> 8;
-	msg->msg[4] = phys_addr & 0xff;
-}
-
-static inline void cec_msg_record_on(struct cec_msg *msg,
-				     bool reply,
-				     const struct cec_op_record_src *rec_src)
-{
-	switch (rec_src->type) {
-	case CEC_OP_RECORD_SRC_OWN:
-		cec_msg_record_on_own(msg);
-		break;
-	case CEC_OP_RECORD_SRC_DIGITAL:
-		cec_msg_record_on_digital(msg, &rec_src->digital);
-		break;
-	case CEC_OP_RECORD_SRC_ANALOG:
-		cec_msg_record_on_analog(msg,
-					 rec_src->analog.ana_bcast_type,
-					 rec_src->analog.ana_freq,
-					 rec_src->analog.bcast_system);
-		break;
-	case CEC_OP_RECORD_SRC_EXT_PLUG:
-		cec_msg_record_on_plug(msg, rec_src->ext_plug.plug);
-		break;
-	case CEC_OP_RECORD_SRC_EXT_PHYS_ADDR:
-		cec_msg_record_on_phys_addr(msg,
-					    rec_src->ext_phys_addr.phys_addr);
-		break;
-	}
-	msg->reply = reply ? CEC_MSG_RECORD_STATUS : 0;
-}
-
-static inline void cec_ops_record_on(const struct cec_msg *msg,
-				     struct cec_op_record_src *rec_src)
-{
-	rec_src->type = msg->msg[2];
-	switch (rec_src->type) {
-	case CEC_OP_RECORD_SRC_OWN:
-		break;
-	case CEC_OP_RECORD_SRC_DIGITAL:
-		cec_get_digital_service_id(msg->msg + 3, &rec_src->digital);
-		break;
-	case CEC_OP_RECORD_SRC_ANALOG:
-		rec_src->analog.ana_bcast_type = msg->msg[3];
-		rec_src->analog.ana_freq =
-			(msg->msg[4] << 8) | msg->msg[5];
-		rec_src->analog.bcast_system = msg->msg[6];
-		break;
-	case CEC_OP_RECORD_SRC_EXT_PLUG:
-		rec_src->ext_plug.plug = msg->msg[3];
-		break;
-	case CEC_OP_RECORD_SRC_EXT_PHYS_ADDR:
-		rec_src->ext_phys_addr.phys_addr =
-			(msg->msg[3] << 8) | msg->msg[4];
-		break;
-	}
-}
-
-static inline void cec_msg_record_status(struct cec_msg *msg, __u8 rec_status)
-{
-	msg->len = 3;
-	msg->msg[1] = CEC_MSG_RECORD_STATUS;
-	msg->msg[2] = rec_status;
-}
-
-static inline void cec_ops_record_status(const struct cec_msg *msg,
-					 __u8 *rec_status)
-{
-	*rec_status = msg->msg[2];
-}
-
-static inline void cec_msg_record_tv_screen(struct cec_msg *msg,
-					    bool reply)
-{
-	msg->len = 2;
-	msg->msg[1] = CEC_MSG_RECORD_TV_SCREEN;
-	msg->reply = reply ? CEC_MSG_RECORD_ON : 0;
-}
-
-
-/* Timer Programming Feature */
-static inline void cec_msg_timer_status(struct cec_msg *msg,
-					__u8 timer_overlap_warning,
-					__u8 media_info,
-					__u8 prog_info,
-					__u8 prog_error,
-					__u8 duration_hr,
-					__u8 duration_min)
-{
-	msg->len = 3;
-	msg->msg[1] = CEC_MSG_TIMER_STATUS;
-	msg->msg[2] = (timer_overlap_warning << 7) |
-		(media_info << 5) |
-		(prog_info ? 0x10 : 0) |
-		(prog_info ? prog_info : prog_error);
-	if (prog_info == CEC_OP_PROG_INFO_NOT_ENOUGH_SPACE ||
-	    prog_info == CEC_OP_PROG_INFO_MIGHT_NOT_BE_ENOUGH_SPACE ||
-	    prog_error == CEC_OP_PROG_ERROR_DUPLICATE) {
-		msg->len += 2;
-		msg->msg[3] = ((duration_hr / 10) << 4) | (duration_hr % 10);
-		msg->msg[4] = ((duration_min / 10) << 4) | (duration_min % 10);
-	}
-}
-
-static inline void cec_ops_timer_status(const struct cec_msg *msg,
-					__u8 *timer_overlap_warning,
-					__u8 *media_info,
-					__u8 *prog_info,
-					__u8 *prog_error,
-					__u8 *duration_hr,
-					__u8 *duration_min)
-{
-	*timer_overlap_warning = msg->msg[2] >> 7;
-	*media_info = (msg->msg[2] >> 5) & 3;
-	if (msg->msg[2] & 0x10) {
-		*prog_info = msg->msg[2] & 0xf;
-		*prog_error = 0;
-	} else {
-		*prog_info = 0;
-		*prog_error = msg->msg[2] & 0xf;
-	}
-	if (*prog_info == CEC_OP_PROG_INFO_NOT_ENOUGH_SPACE ||
-	    *prog_info == CEC_OP_PROG_INFO_MIGHT_NOT_BE_ENOUGH_SPACE ||
-	    *prog_error == CEC_OP_PROG_ERROR_DUPLICATE) {
-		*duration_hr = (msg->msg[3] >> 4) * 10 + (msg->msg[3] & 0xf);
-		*duration_min = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
-	} else {
-		*duration_hr = *duration_min = 0;
-	}
-}
-
-static inline void cec_msg_timer_cleared_status(struct cec_msg *msg,
-						__u8 timer_cleared_status)
-{
-	msg->len = 3;
-	msg->msg[1] = CEC_MSG_TIMER_CLEARED_STATUS;
-	msg->msg[2] = timer_cleared_status;
-}
-
-static inline void cec_ops_timer_cleared_status(const struct cec_msg *msg,
-						__u8 *timer_cleared_status)
-{
-	*timer_cleared_status = msg->msg[2];
-}
-
-static inline void cec_msg_clear_analogue_timer(struct cec_msg *msg,
-						bool reply,
-						__u8 day,
-						__u8 month,
-						__u8 start_hr,
-						__u8 start_min,
-						__u8 duration_hr,
-						__u8 duration_min,
-						__u8 recording_seq,
-						__u8 ana_bcast_type,
-						__u16 ana_freq,
-						__u8 bcast_system)
-{
-	msg->len = 13;
-	msg->msg[1] = CEC_MSG_CLEAR_ANALOGUE_TIMER;
-	msg->msg[2] = day;
-	msg->msg[3] = month;
-	/* Hours and minutes are in BCD format */
-	msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
-	msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
-	msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
-	msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
-	msg->msg[8] = recording_seq;
-	msg->msg[9] = ana_bcast_type;
-	msg->msg[10] = ana_freq >> 8;
-	msg->msg[11] = ana_freq & 0xff;
-	msg->msg[12] = bcast_system;
-	msg->reply = reply ? CEC_MSG_TIMER_CLEARED_STATUS : 0;
-}
-
-static inline void cec_ops_clear_analogue_timer(const struct cec_msg *msg,
-						__u8 *day,
-						__u8 *month,
-						__u8 *start_hr,
-						__u8 *start_min,
-						__u8 *duration_hr,
-						__u8 *duration_min,
-						__u8 *recording_seq,
-						__u8 *ana_bcast_type,
-						__u16 *ana_freq,
-						__u8 *bcast_system)
-{
-	*day = msg->msg[2];
-	*month = msg->msg[3];
-	/* Hours and minutes are in BCD format */
-	*start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
-	*start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
-	*duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
-	*duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
-	*recording_seq = msg->msg[8];
-	*ana_bcast_type = msg->msg[9];
-	*ana_freq = (msg->msg[10] << 8) | msg->msg[11];
-	*bcast_system = msg->msg[12];
-}
-
-static inline void cec_msg_clear_digital_timer(struct cec_msg *msg,
-				bool reply,
-				__u8 day,
-				__u8 month,
-				__u8 start_hr,
-				__u8 start_min,
-				__u8 duration_hr,
-				__u8 duration_min,
-				__u8 recording_seq,
-				const struct cec_op_digital_service_id *digital)
-{
-	msg->len = 16;
-	msg->reply = reply ? CEC_MSG_TIMER_CLEARED_STATUS : 0;
-	msg->msg[1] = CEC_MSG_CLEAR_DIGITAL_TIMER;
-	msg->msg[2] = day;
-	msg->msg[3] = month;
-	/* Hours and minutes are in BCD format */
-	msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
-	msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
-	msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
-	msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
-	msg->msg[8] = recording_seq;
-	cec_set_digital_service_id(msg->msg + 9, digital);
-}
-
-static inline void cec_ops_clear_digital_timer(const struct cec_msg *msg,
-				__u8 *day,
-				__u8 *month,
-				__u8 *start_hr,
-				__u8 *start_min,
-				__u8 *duration_hr,
-				__u8 *duration_min,
-				__u8 *recording_seq,
-				struct cec_op_digital_service_id *digital)
-{
-	*day = msg->msg[2];
-	*month = msg->msg[3];
-	/* Hours and minutes are in BCD format */
-	*start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
-	*start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
-	*duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
-	*duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
-	*recording_seq = msg->msg[8];
-	cec_get_digital_service_id(msg->msg + 9, digital);
-}
-
-static inline void cec_msg_clear_ext_timer(struct cec_msg *msg,
-					   bool reply,
-					   __u8 day,
-					   __u8 month,
-					   __u8 start_hr,
-					   __u8 start_min,
-					   __u8 duration_hr,
-					   __u8 duration_min,
-					   __u8 recording_seq,
-					   __u8 ext_src_spec,
-					   __u8 plug,
-					   __u16 phys_addr)
-{
-	msg->len = 13;
-	msg->msg[1] = CEC_MSG_CLEAR_EXT_TIMER;
-	msg->msg[2] = day;
-	msg->msg[3] = month;
-	/* Hours and minutes are in BCD format */
-	msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
-	msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
-	msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
-	msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
-	msg->msg[8] = recording_seq;
-	msg->msg[9] = ext_src_spec;
-	msg->msg[10] = plug;
-	msg->msg[11] = phys_addr >> 8;
-	msg->msg[12] = phys_addr & 0xff;
-	msg->reply = reply ? CEC_MSG_TIMER_CLEARED_STATUS : 0;
-}
-
-static inline void cec_ops_clear_ext_timer(const struct cec_msg *msg,
-					   __u8 *day,
-					   __u8 *month,
-					   __u8 *start_hr,
-					   __u8 *start_min,
-					   __u8 *duration_hr,
-					   __u8 *duration_min,
-					   __u8 *recording_seq,
-					   __u8 *ext_src_spec,
-					   __u8 *plug,
-					   __u16 *phys_addr)
-{
-	*day = msg->msg[2];
-	*month = msg->msg[3];
-	/* Hours and minutes are in BCD format */
-	*start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
-	*start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
-	*duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
-	*duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
-	*recording_seq = msg->msg[8];
-	*ext_src_spec = msg->msg[9];
-	*plug = msg->msg[10];
-	*phys_addr = (msg->msg[11] << 8) | msg->msg[12];
-}
-
-static inline void cec_msg_set_analogue_timer(struct cec_msg *msg,
-					      bool reply,
-					      __u8 day,
-					      __u8 month,
-					      __u8 start_hr,
-					      __u8 start_min,
-					      __u8 duration_hr,
-					      __u8 duration_min,
-					      __u8 recording_seq,
-					      __u8 ana_bcast_type,
-					      __u16 ana_freq,
-					      __u8 bcast_system)
-{
-	msg->len = 13;
-	msg->msg[1] = CEC_MSG_SET_ANALOGUE_TIMER;
-	msg->msg[2] = day;
-	msg->msg[3] = month;
-	/* Hours and minutes are in BCD format */
-	msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
-	msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
-	msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
-	msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
-	msg->msg[8] = recording_seq;
-	msg->msg[9] = ana_bcast_type;
-	msg->msg[10] = ana_freq >> 8;
-	msg->msg[11] = ana_freq & 0xff;
-	msg->msg[12] = bcast_system;
-	msg->reply = reply ? CEC_MSG_TIMER_STATUS : 0;
-}
-
-static inline void cec_ops_set_analogue_timer(const struct cec_msg *msg,
-					      __u8 *day,
-					      __u8 *month,
-					      __u8 *start_hr,
-					      __u8 *start_min,
-					      __u8 *duration_hr,
-					      __u8 *duration_min,
-					      __u8 *recording_seq,
-					      __u8 *ana_bcast_type,
-					      __u16 *ana_freq,
-					      __u8 *bcast_system)
-{
-	*day = msg->msg[2];
-	*month = msg->msg[3];
-	/* Hours and minutes are in BCD format */
-	*start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
-	*start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
-	*duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
-	*duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
-	*recording_seq = msg->msg[8];
-	*ana_bcast_type = msg->msg[9];
-	*ana_freq = (msg->msg[10] << 8) | msg->msg[11];
-	*bcast_system = msg->msg[12];
-}
-
-static inline void cec_msg_set_digital_timer(struct cec_msg *msg,
-			bool reply,
-			__u8 day,
-			__u8 month,
-			__u8 start_hr,
-			__u8 start_min,
-			__u8 duration_hr,
-			__u8 duration_min,
-			__u8 recording_seq,
-			const struct cec_op_digital_service_id *digital)
-{
-	msg->len = 16;
-	msg->reply = reply ? CEC_MSG_TIMER_STATUS : 0;
-	msg->msg[1] = CEC_MSG_SET_DIGITAL_TIMER;
-	msg->msg[2] = day;
-	msg->msg[3] = month;
-	/* Hours and minutes are in BCD format */
-	msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
-	msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
-	msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
-	msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
-	msg->msg[8] = recording_seq;
-	cec_set_digital_service_id(msg->msg + 9, digital);
-}
-
-static inline void cec_ops_set_digital_timer(const struct cec_msg *msg,
-			__u8 *day,
-			__u8 *month,
-			__u8 *start_hr,
-			__u8 *start_min,
-			__u8 *duration_hr,
-			__u8 *duration_min,
-			__u8 *recording_seq,
-			struct cec_op_digital_service_id *digital)
-{
-	*day = msg->msg[2];
-	*month = msg->msg[3];
-	/* Hours and minutes are in BCD format */
-	*start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
-	*start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
-	*duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
-	*duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
-	*recording_seq = msg->msg[8];
-	cec_get_digital_service_id(msg->msg + 9, digital);
-}
-
-static inline void cec_msg_set_ext_timer(struct cec_msg *msg,
-					 bool reply,
-					 __u8 day,
-					 __u8 month,
-					 __u8 start_hr,
-					 __u8 start_min,
-					 __u8 duration_hr,
-					 __u8 duration_min,
-					 __u8 recording_seq,
-					 __u8 ext_src_spec,
-					 __u8 plug,
-					 __u16 phys_addr)
-{
-	msg->len = 13;
-	msg->msg[1] = CEC_MSG_SET_EXT_TIMER;
-	msg->msg[2] = day;
-	msg->msg[3] = month;
-	/* Hours and minutes are in BCD format */
-	msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
-	msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
-	msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
-	msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
-	msg->msg[8] = recording_seq;
-	msg->msg[9] = ext_src_spec;
-	msg->msg[10] = plug;
-	msg->msg[11] = phys_addr >> 8;
-	msg->msg[12] = phys_addr & 0xff;
-	msg->reply = reply ? CEC_MSG_TIMER_STATUS : 0;
-}
-
-static inline void cec_ops_set_ext_timer(const struct cec_msg *msg,
-					 __u8 *day,
-					 __u8 *month,
-					 __u8 *start_hr,
-					 __u8 *start_min,
-					 __u8 *duration_hr,
-					 __u8 *duration_min,
-					 __u8 *recording_seq,
-					 __u8 *ext_src_spec,
-					 __u8 *plug,
-					 __u16 *phys_addr)
-{
-	*day = msg->msg[2];
-	*month = msg->msg[3];
-	/* Hours and minutes are in BCD format */
-	*start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
-	*start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
-	*duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
-	*duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
-	*recording_seq = msg->msg[8];
-	*ext_src_spec = msg->msg[9];
-	*plug = msg->msg[10];
-	*phys_addr = (msg->msg[11] << 8) | msg->msg[12];
-}
-
-static inline void cec_msg_set_timer_program_title(struct cec_msg *msg,
-						   const char *prog_title)
-{
-	unsigned int len = strlen(prog_title);
-
-	if (len > 14)
-		len = 14;
-	msg->len = 2 + len;
-	msg->msg[1] = CEC_MSG_SET_TIMER_PROGRAM_TITLE;
-	memcpy(msg->msg + 2, prog_title, len);
-}
-
-static inline void cec_ops_set_timer_program_title(const struct cec_msg *msg,
-						   char *prog_title)
-{
-	unsigned int len = msg->len > 2 ? msg->len - 2 : 0;
-
-	if (len > 14)
-		len = 14;
-	memcpy(prog_title, msg->msg + 2, len);
-	prog_title[len] = '\0';
-}
-
-/* System Information Feature */
-static inline void cec_msg_cec_version(struct cec_msg *msg, __u8 cec_version)
-{
-	msg->len = 3;
-	msg->msg[1] = CEC_MSG_CEC_VERSION;
-	msg->msg[2] = cec_version;
-}
-
-static inline void cec_ops_cec_version(const struct cec_msg *msg,
-				       __u8 *cec_version)
-{
-	*cec_version = msg->msg[2];
-}
-
-static inline void cec_msg_get_cec_version(struct cec_msg *msg,
-					   bool reply)
-{
-	msg->len = 2;
-	msg->msg[1] = CEC_MSG_GET_CEC_VERSION;
-	msg->reply = reply ? CEC_MSG_CEC_VERSION : 0;
-}
-
-static inline void cec_msg_report_physical_addr(struct cec_msg *msg,
-					__u16 phys_addr, __u8 prim_devtype)
-{
-	msg->len = 5;
-	msg->msg[0] |= 0xf; /* broadcast */
-	msg->msg[1] = CEC_MSG_REPORT_PHYSICAL_ADDR;
-	msg->msg[2] = phys_addr >> 8;
-	msg->msg[3] = phys_addr & 0xff;
-	msg->msg[4] = prim_devtype;
-}
-
-static inline void cec_ops_report_physical_addr(const struct cec_msg *msg,
-					__u16 *phys_addr, __u8 *prim_devtype)
-{
-	*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
-	*prim_devtype = msg->msg[4];
-}
-
-static inline void cec_msg_give_physical_addr(struct cec_msg *msg,
-					      bool reply)
-{
-	msg->len = 2;
-	msg->msg[1] = CEC_MSG_GIVE_PHYSICAL_ADDR;
-	msg->reply = reply ? CEC_MSG_REPORT_PHYSICAL_ADDR : 0;
-}
-
-static inline void cec_msg_set_menu_language(struct cec_msg *msg,
-					     const char *language)
-{
-	msg->len = 5;
-	msg->msg[0] |= 0xf; /* broadcast */
-	msg->msg[1] = CEC_MSG_SET_MENU_LANGUAGE;
-	memcpy(msg->msg + 2, language, 3);
-}
-
-static inline void cec_ops_set_menu_language(const struct cec_msg *msg,
-					     char *language)
-{
-	memcpy(language, msg->msg + 2, 3);
-	language[3] = '\0';
-}
-
-static inline void cec_msg_get_menu_language(struct cec_msg *msg,
-					     bool reply)
-{
-	msg->len = 2;
-	msg->msg[1] = CEC_MSG_GET_MENU_LANGUAGE;
-	msg->reply = reply ? CEC_MSG_SET_MENU_LANGUAGE : 0;
-}
-
-/*
- * Assumes a single RC Profile byte and a single Device Features byte,
- * i.e. no extended features are supported by this helper function.
- *
- * As of CEC 2.0 no extended features are defined, should those be added
- * in the future, then this function needs to be adapted or a new function
- * should be added.
- */
-static inline void cec_msg_report_features(struct cec_msg *msg,
-				__u8 cec_version, __u8 all_device_types,
-				__u8 rc_profile, __u8 dev_features)
-{
-	msg->len = 6;
-	msg->msg[0] |= 0xf; /* broadcast */
-	msg->msg[1] = CEC_MSG_REPORT_FEATURES;
-	msg->msg[2] = cec_version;
-	msg->msg[3] = all_device_types;
-	msg->msg[4] = rc_profile;
-	msg->msg[5] = dev_features;
-}
-
-static inline void cec_ops_report_features(const struct cec_msg *msg,
-			__u8 *cec_version, __u8 *all_device_types,
-			const __u8 **rc_profile, const __u8 **dev_features)
-{
-	const __u8 *p = &msg->msg[4];
-
-	*cec_version = msg->msg[2];
-	*all_device_types = msg->msg[3];
-	*rc_profile = p;
-	while (p < &msg->msg[14] && (*p & CEC_OP_FEAT_EXT))
-		p++;
-	if (!(*p & CEC_OP_FEAT_EXT)) {
-		*dev_features = p + 1;
-		while (p < &msg->msg[15] && (*p & CEC_OP_FEAT_EXT))
-			p++;
-	}
-	if (*p & CEC_OP_FEAT_EXT)
-		*rc_profile = *dev_features = NULL;
-}
-
-static inline void cec_msg_give_features(struct cec_msg *msg,
-					 bool reply)
-{
-	msg->len = 2;
-	msg->msg[1] = CEC_MSG_GIVE_FEATURES;
-	msg->reply = reply ? CEC_MSG_REPORT_FEATURES : 0;
-}
-
-/* Deck Control Feature */
-static inline void cec_msg_deck_control(struct cec_msg *msg,
-					__u8 deck_control_mode)
-{
-	msg->len = 3;
-	msg->msg[1] = CEC_MSG_DECK_CONTROL;
-	msg->msg[2] = deck_control_mode;
-}
-
-static inline void cec_ops_deck_control(const struct cec_msg *msg,
-					__u8 *deck_control_mode)
-{
-	*deck_control_mode = msg->msg[2];
-}
-
-static inline void cec_msg_deck_status(struct cec_msg *msg,
-				       __u8 deck_info)
-{
-	msg->len = 3;
-	msg->msg[1] = CEC_MSG_DECK_STATUS;
-	msg->msg[2] = deck_info;
-}
-
-static inline void cec_ops_deck_status(const struct cec_msg *msg,
-				       __u8 *deck_info)
-{
-	*deck_info = msg->msg[2];
-}
-
-static inline void cec_msg_give_deck_status(struct cec_msg *msg,
-					    bool reply,
-					    __u8 status_req)
-{
-	msg->len = 3;
-	msg->msg[1] = CEC_MSG_GIVE_DECK_STATUS;
-	msg->msg[2] = status_req;
-	msg->reply = reply ? CEC_MSG_DECK_STATUS : 0;
-}
-
-static inline void cec_ops_give_deck_status(const struct cec_msg *msg,
-					    __u8 *status_req)
-{
-	*status_req = msg->msg[2];
-}
-
-static inline void cec_msg_play(struct cec_msg *msg,
-				__u8 play_mode)
-{
-	msg->len = 3;
-	msg->msg[1] = CEC_MSG_PLAY;
-	msg->msg[2] = play_mode;
-}
-
-static inline void cec_ops_play(const struct cec_msg *msg,
-				__u8 *play_mode)
-{
-	*play_mode = msg->msg[2];
-}
-
-
-/* Tuner Control Feature */
-struct cec_op_tuner_device_info {
-	__u8 rec_flag;
-	__u8 tuner_display_info;
-	bool is_analog;
-	union {
-		struct cec_op_digital_service_id digital;
-		struct {
-			__u8 ana_bcast_type;
-			__u16 ana_freq;
-			__u8 bcast_system;
-		} analog;
-	};
-};
-
-static inline void cec_msg_tuner_device_status_analog(struct cec_msg *msg,
-						      __u8 rec_flag,
-						      __u8 tuner_display_info,
-						      __u8 ana_bcast_type,
-						      __u16 ana_freq,
-						      __u8 bcast_system)
-{
-	msg->len = 7;
-	msg->msg[1] = CEC_MSG_TUNER_DEVICE_STATUS;
-	msg->msg[2] = (rec_flag << 7) | tuner_display_info;
-	msg->msg[3] = ana_bcast_type;
-	msg->msg[4] = ana_freq >> 8;
-	msg->msg[5] = ana_freq & 0xff;
-	msg->msg[6] = bcast_system;
-}
-
-static inline void cec_msg_tuner_device_status_digital(struct cec_msg *msg,
-		   __u8 rec_flag, __u8 tuner_display_info,
-		   const struct cec_op_digital_service_id *digital)
-{
-	msg->len = 10;
-	msg->msg[1] = CEC_MSG_TUNER_DEVICE_STATUS;
-	msg->msg[2] = (rec_flag << 7) |