console: Delete unused con_font_copy() callback implementations

Recently in commit 3c4e0dff2095 ("vt: Disable KD_FONT_OP_COPY") we
disabled the KD_FONT_OP_COPY ioctl() option. Delete all the
con_font_copy() callbacks, since we no longer use them.

Mark KD_FONT_OP_COPY as "obsolete" in include/uapi/linux/kd.h, just like
what we have done for PPPIOCDETACH in commit af8d3c7c001a ("ppp: remove
the PPPIOCDETACH ioctl").

Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/c8d28007edf50de4387e1532eb3eb736db716f73.1605169912.git.yepeilin.cs@gmail.com

diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c
index c63e545fb1051bab5f55bf519a97942a0c1ac904..fd9954381fbf370f88f83e071821776d518ec497 100644 (file)
--- a/drivers/usb/misc/sisusbvga/sisusb_con.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_con.c
@@ -1358,11 +1358,6 @@ static int sisusbdummycon_font_default(struct vc_data *vc,
        return 0;
 }
 
-static int sisusbdummycon_font_copy(struct vc_data *vc, int con)
-{
-       return 0;
-}
-
 static const struct consw sisusb_dummy_con = {
        .owner =                THIS_MODULE,
        .con_startup =          sisusbdummycon_startup,
@@ -1377,7 +1372,6 @@ static const struct consw sisusb_dummy_con = {
        .con_blank =            sisusbdummycon_blank,
        .con_font_set =         sisusbdummycon_font_set,
        .con_font_default =     sisusbdummycon_font_default,
-       .con_font_copy =        sisusbdummycon_font_copy,
 };
 
 int

diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index 2a0d0bda7faa50d58666ae1aff76a44cf1abbff1..ab3df752fb57138f679a0de4b24137cdfdddfd7c 100644 (file)
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -136,11 +136,6 @@ static int dummycon_font_default(struct vc_data *vc,
        return 0;
 }
 
-static int dummycon_font_copy(struct vc_data *vc, int con)
-{
-       return 0;
-}
-
 /*
  *  The console `switch' structure for the dummy console
  *
@@ -161,6 +156,5 @@ const struct consw dummy_con = {
        .con_blank =    dummycon_blank,
        .con_font_set = dummycon_font_set,
        .con_font_default =     dummycon_font_default,
-       .con_font_copy =        dummycon_font_copy,
 };
 EXPORT_SYMBOL_GPL(dummy_con);

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index cef437817b0dc670e63cf1e8f6ab6512522558b4..26d1b09166922e7161480315e0728d1b440c6e8a 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -2451,16 +2451,6 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
        return 0;
 }
 
-static int fbcon_copy_font(struct vc_data *vc, int con)
-{
-       struct fbcon_display *od = &fb_display[con];
-       struct console_font *f = &vc->vc_font;
-
-       if (od->fontdata == f->data)
-               return 0;       /* already the same font... */
-       return fbcon_do_set_font(vc, f->width, f->height, od->fontdata, od->userfont);
-}
-
 /*
  *  User asked to set font; we are guaranteed that
  *     a) width and height are in range 1..32
@@ -3111,7 +3101,6 @@ static const struct consw fb_con = {
        .con_font_set           = fbcon_set_font,
        .con_font_get           = fbcon_get_font,
        .con_font_default       = fbcon_set_def_font,
-       .con_font_copy          = fbcon_copy_font,
        .con_set_palette        = fbcon_set_palette,
        .con_invert_region      = fbcon_invert_region,
        .con_screen_pos         = fbcon_screen_pos,

diff --git a/include/linux/console.h b/include/linux/console.h
index 4b1e26c4cb4286603b0a381022fef0468bb8728c..20874db50bc8a5ad054bdc607e44d842fe5f7274 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -62,7 +62,6 @@ struct consw {
        int     (*con_font_get)(struct vc_data *vc, struct console_font *font);
        int     (*con_font_default)(struct vc_data *vc,
                        struct console_font *font, char *name);
-       int     (*con_font_copy)(struct vc_data *vc, int con);
        int     (*con_resize)(struct vc_data *vc, unsigned int width,
                        unsigned int height, unsigned int user);
        void    (*con_set_palette)(struct vc_data *vc,

diff --git a/include/uapi/linux/kd.h b/include/uapi/linux/kd.h
index 4616b31f84da295fd5147b432d035f05a2a06a7c..ee929ece411277cf320b3cc4b340f1971518d9de 100644 (file)
--- a/include/uapi/linux/kd.h
+++ b/include/uapi/linux/kd.h
@@ -173,7 +173,7 @@ struct console_font {
 #define KD_FONT_OP_SET         0       /* Set font */
 #define KD_FONT_OP_GET         1       /* Get font */
 #define KD_FONT_OP_SET_DEFAULT 2       /* Set font to default, data points to name / NULL */
-#define KD_FONT_OP_COPY                3       /* Copy from another console */
+#define KD_FONT_OP_COPY                3       /* Obsolete, do not use */
 
 #define KD_FONT_FLAG_DONT_RECALC       1       /* Don't recalculate hw charcell size [compat] */