lib/fonts: Remove FNTCHARCNT()

The character count in the font data is unused. The internal fonts also
do not set it. Remove FNTCHARCNT().

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 337e04236d6d3eda785bcbb1c409f9e2ecbddb93..259a63fc77897198eb94f94244c577d65fcbd1b9 100644 (file)
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -516,7 +516,6 @@ static int newport_set_font(int unit, const struct console_font *op,
 
        new_data += FONT_EXTRA_WORDS * sizeof(int);
        FNTSIZE(new_data) = size;
-       FNTCHARCNT(new_data) = op->charcount;
        REFCOUNT(new_data) = 0; /* usage counter */
        FNTSUM(new_data) = 0;
 

diff --git a/include/linux/font.h b/include/linux/font.h
index fd8625cd76b259aba2be020e4f5f80a64a05fb14..d929c5fa32ca19aa8bc37718899e3595d6161c68 100644 (file)
--- a/include/linux/font.h
+++ b/include/linux/font.h
@@ -68,7 +68,6 @@ extern const struct font_desc *get_default_font(int xres, int yres,
 /* Extra word getters */
 #define REFCOUNT(fd)   (((int *)(fd))[-1])
 #define FNTSIZE(fd)    (((int *)(fd))[-2])
-#define FNTCHARCNT(fd) (((int *)(fd))[-3])
 #define FNTSUM(fd)     (((int *)(fd))[-4])
 
 #define FONT_EXTRA_WORDS 4