Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Xingrui Yi <yixingrui@linux.alibaba.com>
To:     gregkh@linuxfoundation.org
Cc:     linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
        Xingrui Yi <yixingrui@linux.alibaba.com>
Subject: [PATCH] vt: remove old FONT ioctls definitions in uapi
Date:   Fri, 22 Jul 2022 14:11:33 +0800
Message-Id: <20220722061133.7765-1-yixingrui@linux.alibaba.com>
Precedence: bulk

As was demonstrated by commit ff2047fb755d ("vt: drop old FONT ioctls"),
old font ioctls like PIO_FONT have been deleted and KDFONTOP ioctl is used
for years instead.

However, unused definitions of these ioctl numbers and "strut
consolefontdesc" still exist in a uapi header. They could have been removed
since no userspace was using them. Otherwise they will become a
misleading for users, and users will fail with ENOTTY with wrong call.

We are moving old font ioctl numbers definitions here to guide users to
use KDFONTOP.

Signed-off-by: Xingrui Yi <yixingrui@linux.alibaba.com>
---
 include/uapi/linux/kd.h | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/include/uapi/linux/kd.h b/include/uapi/linux/kd.h
index ee929ece4112..d739b17fc942 100644
--- a/include/uapi/linux/kd.h
+++ b/include/uapi/linux/kd.h
@@ -6,19 +6,6 @@
 
 /* 0x4B is 'K', to avoid collision with termios and vt */
 
-#define GIO_FONT	0x4B60	/* gets font in expanded form */
-#define PIO_FONT	0x4B61	/* use font in expanded form */
-
-#define GIO_FONTX	0x4B6B	/* get font using struct consolefontdesc */
-#define PIO_FONTX	0x4B6C	/* set font using struct consolefontdesc */
-struct consolefontdesc {
-	unsigned short charcount;	/* characters in font (256 or 512) */
-	unsigned short charheight;	/* scan lines per character (1-32) */
-	char __user *chardata;		/* font data in expanded form */
-};
-
-#define PIO_FONTRESET   0x4B6D	/* reset to default font */
-
 #define GIO_CMAP	0x4B70	/* gets colour palette on VGA+ */
 #define PIO_CMAP	0x4B71	/* sets colour palette on VGA+ */
 
-- 
2.27.0