Skip to contentSkip to conversation

WTF: patch "[PATCH] media: cec: remove cec-edid.c" was seriously submitted to be applied to the 4.18-stable tree?

PATCH [email protected] 1 participant 1 message Nov 12, 2018

Subsystems (3)
Stable branch Media (V4L/DVB) CEC framework
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below was submitted to be applied to the 4.18-stable tree.

I fail to see how this patch meets the stable kernel rules as found at Documentation/process/stable-kernel-rules.rst.

I could be totally wrong, and if so, please respond to <[email protected]> and let me know why this patch should be applied. Otherwise, it is now dropped from my patch queues, never to be seen again.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From f94d463f1b7f83d465ed77521821583dbcdaa3c5 Mon Sep 17 00:00:00 2001

From: Hans Verkuil <[email protected]>
Date: Thu, 13 Sep 2018 08:00:39 -0400
Subject: [PATCH] media: cec: remove cec-edid.c

Move cec_get_edid_phys_addr() to cec-adap.c. It's not worth keeping a separate source for this.

Signed-off-by Hans Verkuil <[email protected]>
Cc <[email protected]> # for v4.17 and up
Signed-off-by Mauro Carvalho Chehab <[email protected]>
drivers/media/cec/Makefile +1 -1
index 29a2ab9e77c5..ad8677d8c896 100644
@@ -1,5 +1,5 @@
 # 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
drivers/media/cec/cec-adap.c +13 -0
index 030b2602faf0..829878356e1e 100644
@@ -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.
drivers/media/cec/cec-edid.c deleted +0 -24
deleted file mode 100644
index e2f54eec0829..000000000000
@@ -1,24 +0,0 @@
-// 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);