Skip to contentSkip to conversation

video: Drop DEV_FLAGS_SYSTEM flag

PATCH New Bin Meng 2 participants 4 messages Nov 4, 2015 – Nov 5, 2015

Subsystems (7)
lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/2 video: Drop DEV_FLAGS_SYSTEM flag

DEV_FLAGS_SYSTEM does not have any actual meaning, hence drop it.

---

 arch/blackfin/cpu/jtag-console.c | 2 +-
 board/bf527-ezkit/video.c        | 1 -
 board/bf533-stamp/video.c        | 1 -
 board/bf548-ezkit/video.c        | 1 -
 board/cm-bf548/video.c           | 1 -
 board/kosagi/novena/novena.c     | 2 +-
 board/mpl/common/kbd.c           | 2 +-
 board/mpl/pati/pati.c            | 2 +-
 common/cmd_console.c             | 3 +--
 common/stdio.c                   | 4 ++--
 common/usb_kbd.c                 | 2 +-
 drivers/input/cros_ec_keyb.c     | 2 +-
 drivers/input/keyboard.c         | 2 +-
 drivers/input/tegra-kbc.c        | 2 +-
 drivers/net/netconsole.c         | 2 +-
 drivers/video/cfb_console.c      | 2 +-
 include/stdio_dev.h              | 1 -
 17 files changed, 13 insertions(+), 19 deletions(-)
arch/blackfin/cpu/jtag-console.c +1 -1
index b0abeda..29e7a44 100644
@@ -183,7 +183,7 @@ int drv_jtag_console_init(void)
 
 	memset(&dev, 0x00, sizeof(dev));
 	strcpy(dev.name, "jtag");
-	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
 	dev.putc = jtag_putc;
 	dev.puts = jtag_puts;
 	dev.tstc = jtag_tstc;
board/bf527-ezkit/video.c +0 -1
index c2bf145..530b956 100644
@@ -439,7 +439,6 @@ int drv_video_init(void)
 
 	strcpy(videodev.name, "video");
 	videodev.ext = DEV_EXT_VIDEO;	/* Video extensions */
-	videodev.flags = DEV_FLAGS_SYSTEM;	/* No Output */
 
 	error = stdio_register(&videodev);
 
board/bf533-stamp/video.c +0 -1
index 75b8adc..a451f97 100644
@@ -165,7 +165,6 @@ int drv_video_init(void)
 	memset(&videodev, 0, sizeof(videodev));
 	strcpy(videodev.name, "video");
 	videodev.ext = DEV_EXT_VIDEO;
-	videodev.flags = DEV_FLAGS_SYSTEM;
 
 	return stdio_register(&videodev);
 }
board/bf548-ezkit/video.c +0 -1
index 47e68c6..9cc6c74 100644
@@ -329,7 +329,6 @@ int drv_video_init(void)
 
 	strcpy(videodev.name, "video");
 	videodev.ext = DEV_EXT_VIDEO;	/* Video extensions */
-	videodev.flags = DEV_FLAGS_SYSTEM;	/* No Output */
 
 	error = stdio_register(&videodev);
 
board/cm-bf548/video.c +0 -1
index b098615..2867260 100644
@@ -333,7 +333,6 @@ int drv_video_init(void)
 
 	strcpy(videodev.name, "video");
 	videodev.ext = DEV_EXT_VIDEO;	/* Video extensions */
-	videodev.flags = DEV_FLAGS_SYSTEM;	/* No Output */
 
 	error = stdio_register(&videodev);
 
board/kosagi/novena/novena.c +1 -1
index 69f5be3..919133b 100644
@@ -77,7 +77,7 @@ int drv_keyboard_init(void)
 	int error;
 	struct stdio_dev dev = {
 		.name	= "button",
-		.flags	= DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM,
+		.flags	= DEV_FLAGS_INPUT,
 		.start	= novena_gpio_button_init,
 		.getc	= novena_gpio_button_getc,
 		.tstc	= novena_gpio_button_tstc,
board/mpl/common/kbd.c +1 -1
index 99de2ca..1da72c5 100644
@@ -203,7 +203,7 @@ int drv_isa_kbd_init (void)
 		return -1;
 	memset (&kbddev, 0, sizeof(kbddev));
 	strcpy(kbddev.name, DEVNAME);
-	kbddev.flags =  DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	kbddev.flags =  DEV_FLAGS_INPUT;
 	kbddev.getc = kbd_getc ;
 	kbddev.tstc = kbd_testc ;
 
board/mpl/pati/pati.c +1 -1
index b9d88ee..958cdec 100644
@@ -566,7 +566,7 @@ void pci_con_connect(void)
 	irq_install_handler (0x2, (interrupt_handler_t *) pci_dorbell_irq,NULL);
 	memset (&pci_con_dev, 0, sizeof (pci_con_dev));
 	strcpy (pci_con_dev.name, "pci_con");
-	pci_con_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	pci_con_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
 	pci_con_dev.putc = pci_con_putc;
 	pci_con_dev.puts = pci_con_puts;
 	pci_con_dev.getc = pci_con_getc;
common/cmd_console.c +1 -2
index 93dc505..9a356ec 100644
@@ -27,10 +27,9 @@ static int do_coninfo(cmd_tbl_t *cmd, int flag, int argc, char * const argv[])
 	list_for_each(pos, list) {
 		dev = list_entry(pos, struct stdio_dev, list);
 
-		printf ("%-8s %08x %c%c%c ",
+		printf ("%-8s %08x %c%c ",
 			dev->name,
 			dev->flags,
-			(dev->flags & DEV_FLAGS_SYSTEM) ? 'S' : '.',
 			(dev->flags & DEV_FLAGS_INPUT) ? 'I' : '.',
 			(dev->flags & DEV_FLAGS_OUTPUT) ? 'O' : '.');
 
common/stdio.c +2 -2
index adbfc89..ab4df20 100644
@@ -88,7 +88,7 @@ static void drv_system_init (void)
 	memset (&dev, 0, sizeof (dev));
 
 	strcpy (dev.name, "serial");
-	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
 	dev.putc = stdio_serial_putc;
 	dev.puts = stdio_serial_puts;
 	dev.getc = stdio_serial_getc;
@@ -99,7 +99,7 @@ static void drv_system_init (void)
 	memset (&dev, 0, sizeof (dev));
 
 	strcpy (dev.name, "nulldev");
-	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
 	dev.putc = nulldev_putc;
 	dev.puts = nulldev_puts;
 	dev.getc = nulldev_input;
common/usb_kbd.c +1 -1
index 95912f9..0302e5b 100644
@@ -503,7 +503,7 @@ static int probe_usb_keyboard(struct usb_device *dev)
 	debug("USB KBD: register.\n");
 	memset(&usb_kbd_dev, 0, sizeof(struct stdio_dev));
 	strcpy(usb_kbd_dev.name, DEVNAME);
-	usb_kbd_dev.flags =  DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	usb_kbd_dev.flags =  DEV_FLAGS_INPUT;
 	usb_kbd_dev.getc = usb_kbd_getc;
 	usb_kbd_dev.tstc = usb_kbd_testc;
 	usb_kbd_dev.priv = (void *)dev;
drivers/input/cros_ec_keyb.c +1 -1
index a31aa77..dd150ee 100644
@@ -258,7 +258,7 @@ int drv_keyboard_init(void)
 
 	memset(&dev, '\0', sizeof(dev));
 	strcpy(dev.name, "cros-ec-keyb");
-	dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	dev.flags = DEV_FLAGS_INPUT;
 	dev.getc = kbd_getc;
 	dev.tstc = kbd_tstc;
 	dev.start = cros_ec_init_keyboard;
drivers/input/keyboard.c +1 -1
index be0f333..ca3886a 100644
@@ -274,7 +274,7 @@ int kbd_init (void)
 		return -1;
 	memset (&kbddev, 0, sizeof(kbddev));
 	strcpy(kbddev.name, DEVNAME);
-	kbddev.flags =  DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	kbddev.flags =  DEV_FLAGS_INPUT;
 	kbddev.getc = kbd_getc ;
 	kbddev.tstc = kbd_testc ;
 
drivers/input/tegra-kbc.c +1 -1
index c9c9fac..6b88db4 100644
@@ -358,7 +358,7 @@ int drv_keyboard_init(void)
 
 	memset(&dev, '\0', sizeof(dev));
 	strcpy(dev.name, "tegra-kbc");
-	dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	dev.flags = DEV_FLAGS_INPUT;
 	dev.getc = kbd_getc;
 	dev.tstc = kbd_tstc;
 	dev.start = init_tegra_keyboard;
drivers/net/netconsole.c +1 -1
index bf972dc..3500047 100644
@@ -330,7 +330,7 @@ int drv_nc_init(void)
 	memset(&dev, 0, sizeof(dev));
 
 	strcpy(dev.name, "nc");
-	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
 	dev.start = nc_stdio_start;
 	dev.putc = nc_stdio_putc;
 	dev.puts = nc_stdio_puts;
drivers/video/cfb_console.c +1 -1
index aa7ca86..51cdd4d 100644
@@ -2281,7 +2281,7 @@ int drv_video_init(void)
 	memset(&console_dev, 0, sizeof(console_dev));
 	strcpy(console_dev.name, "vga");
 	console_dev.ext = DEV_EXT_VIDEO;	/* Video extensions */
-	console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_SYSTEM;
+	console_dev.flags = DEV_FLAGS_OUTPUT;
 	console_dev.putc = video_putc;	/* 'putc' function */
 	console_dev.puts = video_puts;	/* 'puts' function */
 
include/stdio_dev.h +0 -1
index 95d6246..d473f16 100644
@@ -16,7 +16,6 @@
 
 #define DEV_FLAGS_INPUT	 0x00000001	/* Device can be used as input	console */
 #define DEV_FLAGS_OUTPUT 0x00000002	/* Device can be used as output console */
-#define DEV_FLAGS_SYSTEM 0x80000000	/* Device is a system device		*/
 #define DEV_EXT_VIDEO	 0x00000001	/* Video extensions supported		*/
 
 /* Device information */
Signature · 1 line
1.8.2.1
author
#1 lore raw

PATCH 2/2 video: Drop DEV_EXT_VIDEO flag

DEV_EXT_VIDEO does not have any actual meaning, hence drop it.

---

 arch/powerpc/cpu/mpc8xx/video.c | 1 -
 board/bf527-ezkit/video.c       | 1 -
 board/bf533-stamp/video.c       | 1 -
 board/bf548-ezkit/video.c       | 1 -
 board/cm-bf548/video.c          | 1 -
 drivers/video/cfb_console.c     | 1 -
 include/stdio_dev.h             | 1 -
 7 files changed, 7 deletions(-)
arch/powerpc/cpu/mpc8xx/video.c +0 -1
index 659e688..15cee3f 100644
@@ -1089,7 +1089,6 @@ int drv_video_init (void)
 	memset (&videodev, 0, sizeof (videodev));
 
 	strcpy (videodev.name, "video");
-	videodev.ext = DEV_EXT_VIDEO;	/* Video extensions */
 	videodev.flags = DEV_FLAGS_OUTPUT;	/* Output only */
 	videodev.putc = video_putc;	/* 'putc' function */
 	videodev.puts = video_puts;	/* 'puts' function */
board/bf527-ezkit/video.c +0 -1
index 530b956..a57f9fe 100644
@@ -438,7 +438,6 @@ int drv_video_init(void)
 	memset(&videodev, 0, sizeof(videodev));
 
 	strcpy(videodev.name, "video");
-	videodev.ext = DEV_EXT_VIDEO;	/* Video extensions */
 
 	error = stdio_register(&videodev);
 
board/bf533-stamp/video.c +0 -1
index a451f97..e9b9a9a 100644
@@ -164,7 +164,6 @@ int drv_video_init(void)
 
 	memset(&videodev, 0, sizeof(videodev));
 	strcpy(videodev.name, "video");
-	videodev.ext = DEV_EXT_VIDEO;
 
 	return stdio_register(&videodev);
 }
board/bf548-ezkit/video.c +0 -1
index 9cc6c74..3765993 100644
@@ -328,7 +328,6 @@ int drv_video_init(void)
 	memset(&videodev, 0, sizeof(videodev));
 
 	strcpy(videodev.name, "video");
-	videodev.ext = DEV_EXT_VIDEO;	/* Video extensions */
 
 	error = stdio_register(&videodev);
 
board/cm-bf548/video.c +0 -1
index 2867260..b8cc873 100644
@@ -332,7 +332,6 @@ int drv_video_init(void)
 	memset(&videodev, 0, sizeof(videodev));
 
 	strcpy(videodev.name, "video");
-	videodev.ext = DEV_EXT_VIDEO;	/* Video extensions */
 
 	error = stdio_register(&videodev);
 
drivers/video/cfb_console.c +0 -1
index 51cdd4d..556a55f 100644
@@ -2280,7 +2280,6 @@ int drv_video_init(void)
 	/* Init vga device */
 	memset(&console_dev, 0, sizeof(console_dev));
 	strcpy(console_dev.name, "vga");
-	console_dev.ext = DEV_EXT_VIDEO;	/* Video extensions */
 	console_dev.flags = DEV_FLAGS_OUTPUT;
 	console_dev.putc = video_putc;	/* 'putc' function */
 	console_dev.puts = video_puts;	/* 'puts' function */
include/stdio_dev.h +0 -1
index d473f16..13f76be 100644
@@ -16,7 +16,6 @@
 
 #define DEV_FLAGS_INPUT	 0x00000001	/* Device can be used as input	console */
 #define DEV_FLAGS_OUTPUT 0x00000002	/* Device can be used as output console */
-#define DEV_EXT_VIDEO	 0x00000001	/* Video extensions supported		*/
 
 /* Device information */
 struct stdio_dev {
Signature · 1 line
1.8.2.1
#2 lore raw

PATCH 2/2 video: Drop DEV_EXT_VIDEO flag

Quoted 6 lines · On Tue, 3 Nov 2015 23:23:38 -0800 Bin Meng <[email protected]> wrote:

DEV_EXT_VIDEO does not have any actual meaning, hence drop it.

---

Quoted 8 lines
 arch/powerpc/cpu/mpc8xx/video.c | 1 -
 board/bf527-ezkit/video.c       | 1 -
 board/bf533-stamp/video.c       | 1 -
 board/bf548-ezkit/video.c       | 1 -
 board/cm-bf548/video.c          | 1 -
 drivers/video/cfb_console.c     | 1 -
 include/stdio_dev.h             | 1 -
 7 files changed, 7 deletions(-)

applied to u-boot-video/master, thanks!

Anatolij

#3 lore raw

PATCH 1/2 video: Drop DEV_FLAGS_SYSTEM flag

In reply to Bin Meng
Quoted 15 lines · On Tue, 3 Nov 2015 23:23:37 -0800 Bin Meng <[email protected]> wrote:

DEV_FLAGS_SYSTEM does not have any actual meaning, hence drop it.

---

 arch/blackfin/cpu/jtag-console.c | 2 +-
 board/bf527-ezkit/video.c        | 1 -
 board/bf533-stamp/video.c        | 1 -
 board/bf548-ezkit/video.c        | 1 -
 board/cm-bf548/video.c           | 1 -
 board/kosagi/novena/novena.c     | 2 +-
 board/mpl/common/kbd.c           | 2 +-
 board/mpl/pati/pati.c            | 2 +-
 common/cmd_console.c             | 3 +--
 common/stdio.c                   | 4 ++--
Quoted 8 lines
 common/usb_kbd.c                 | 2 +-
 drivers/input/cros_ec_keyb.c     | 2 +-
 drivers/input/keyboard.c         | 2 +-
 drivers/input/tegra-kbc.c        | 2 +-
 drivers/net/netconsole.c         | 2 +-
 drivers/video/cfb_console.c      | 2 +-
 include/stdio_dev.h              | 1 -
 17 files changed, 13 insertions(+), 19 deletions(-)

applied to u-boot-video/master, thanks!

Anatolij