[PATCH] fixup! video: implement bochs dispi / QEMU VGA driver for PCI and ISA

[Ahmad Fatoum <ahmad@xxxxxx>]

Fix few comments and while at it, replace a -1 error with a more
descriptive error code. No functional change.

Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx>
---
 drivers/video/bochs/Kconfig     | 2 ++
 drivers/video/bochs/Makefile    | 2 ++
 drivers/video/bochs/bochs_hw.c  | 6 ++++--
 drivers/video/bochs/bochs_hw.h  | 2 ++
 drivers/video/bochs/bochs_isa.c | 2 +-
 drivers/video/bochs/bochs_pci.c | 2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/video/bochs/Kconfig b/drivers/video/bochs/Kconfig
index e23e68f1126c..ae5d38a8ad46 100644
--- a/drivers/video/bochs/Kconfig
+++ b/drivers/video/bochs/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
 config DRIVER_VIDEO_BOCHS
 	select DRIVER_VIDEO_EDID
 	bool
diff --git a/drivers/video/bochs/Makefile b/drivers/video/bochs/Makefile
index 78ec1fe0ca81..3ab7ade8a180 100644
--- a/drivers/video/bochs/Makefile
+++ b/drivers/video/bochs/Makefile
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
 obj-y += bochs_hw.o
 obj-$(CONFIG_DRIVER_VIDEO_BOCHS_PCI) += bochs_pci.o
 obj-$(CONFIG_DRIVER_VIDEO_BOCHS_ISA) += bochs_isa.o
diff --git a/drivers/video/bochs/bochs_hw.c b/drivers/video/bochs/bochs_hw.c
index 4f908a60318d..252350aebb5a 100644
--- a/drivers/video/bochs/bochs_hw.c
+++ b/drivers/video/bochs/bochs_hw.c
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 // SPDX-FileCopyrightText: Copyright (c) 2020 Ahmad Fatoum, Pengutronix
 /*
- *  PCI Driver for VGA with the Bochs VBE / QEMU stdvga extensions.
+ *  Driver for VGA with the Bochs VBE / QEMU stdvga extensions.
+ *
+ *  Based on the Linux v5.11-rc1 bochs-dispi DRM driver.
  */
 
 #include <common.h>
@@ -125,7 +127,7 @@ static int bochs_hw_load_edid(struct bochs *bochs)
 	/* check header to detect whenever edid support is enabled in qemu */
 	if (!edid_check_header(edid)) {
 		free(edid);
-		return -1;
+		return -EILSEQ;
 	}
 
 	for (i = EDID_HEADER_END + 1; i < EDID_LENGTH; i++)
diff --git a/drivers/video/bochs/bochs_hw.h b/drivers/video/bochs/bochs_hw.h
index 36c2cc1cc376..420b58f4dad6 100644
--- a/drivers/video/bochs/bochs_hw.h
+++ b/drivers/video/bochs/bochs_hw.h
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #ifndef BOCHS_HW_H
 #define BOCHS_HW_H
 
diff --git a/drivers/video/bochs/bochs_isa.c b/drivers/video/bochs/bochs_isa.c
index 7f75803baa0c..f273ac5f74a8 100644
--- a/drivers/video/bochs/bochs_isa.c
+++ b/drivers/video/bochs/bochs_isa.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 // SPDX-FileCopyrightText: Copyright (c) 2020 Ahmad Fatoum, Pengutronix
 /*
- *  ISA Driver for VGA with the Bochs VBE / QEMU stdvga extensions.
+ *  ISA driver entry point for VGA with the Bochs VBE / QEMU stdvga extensions.
  */
 
 #include <common.h>
diff --git a/drivers/video/bochs/bochs_pci.c b/drivers/video/bochs/bochs_pci.c
index 39f582029d35..28785e1c0667 100644
--- a/drivers/video/bochs/bochs_pci.c
+++ b/drivers/video/bochs/bochs_pci.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 // SPDX-FileCopyrightText: Copyright (c) 2020 Ahmad Fatoum, Pengutronix
 /*
- *  PCI Driver for VGA with the Bochs VBE / QEMU stdvga extensions.
+ *  PCI driver entry point for VGA with the Bochs VBE / QEMU stdvga extensions.
  */
 
 #include <common.h>
-- 
2.29.2


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox