media: cec: remove cec-edid.c (f94d463f) · Commits · 戴 / test

drivers/media/cec/Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		cec-objs := cec-core.o cec-adap.o cec-api.o cec-edid.o
		cec-objs := cec-core.o cec-adap.o cec-api.o

		ifeq ($(CONFIG_CEC_NOTIFIER),y)
		cec-objs += cec-notifier.o

+13 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,19 @@ static unsigned int cec_log_addr2dev(const struct cec_adapter *adap, u8 log_addr
		return adap->log_addrs.primary_device_type[i < 0 ? 0 : i];
		}

		u16 cec_get_edid_phys_addr(const u8 *edid, unsigned int size,
		unsigned int *offset)
		{
		unsigned int loc = cec_get_edid_spa_location(edid, size);

		if (offset)
		*offset = loc;
		if (loc == 0)
		return CEC_PHYS_ADDR_INVALID;
		return (edid[loc] << 8) \| edid[loc + 1];
		}
		EXPORT_SYMBOL_GPL(cec_get_edid_phys_addr);

		/*
		* Queue a new event for this filehandle. If ts == 0, then set it
		* to the current time.

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* cec-edid - HDMI Consumer Electronics Control EDID & CEC helper functions
		*
		* Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
		*/

		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <linux/types.h>
		#include <media/cec.h>

		u16 cec_get_edid_phys_addr(const u8 *edid, unsigned int size,
		unsigned int *offset)
		{
		unsigned int loc = cec_get_edid_spa_location(edid, size);

		if (offset)
		*offset = loc;
		if (loc == 0)
		return CEC_PHYS_ADDR_INVALID;
		return (edid[loc] << 8) \| edid[loc + 1];
		}
		EXPORT_SYMBOL_GPL(cec_get_edid_phys_addr);