kill include/video/edid.h
PATCH 1/1 kill include/video/edid.h
This patch removes some completely unused code.
---
arch/i386/boot/compressed/misc.c | 1 - arch/i386/kernel/setup.c | 4 ---- arch/x86_64/kernel/setup.c | 3 --- drivers/video/fbmon.c | 1 - drivers/video/vesafb.c | 3 --- include/asm-i386/setup.h | 1 - include/asm-x86_64/bootsetup.h | 1 - include/video/edid.h | 27 --------------------------- 8 files changed, 41 deletions(-)
arch/i386/kernel/setup.c renamed from arch/i386/kernel/setup.c.old +0 -4
@@ -43,8 +43,6 @@#include <linux/nodemask.h> #include <linux/kexec.h> -#include <video/edid.h> -#include <asm/apic.h> #include <asm/e820.h> #include <asm/mpspec.h>
@@ -118,7 +116,6 @@unsigned short length;unsigned char table[0 ]; }; -struct edid_info edid_info;struct ist_info ist_info;struct e820map e820;
@@ -1468,7 +1465,6 @@ROOT_DEV =old_decode_dev (ORIG_ROOT_DEV ); drive_info =DRIVE_INFO ; screen_info =SCREEN_INFO ; - edid_info =EDID_INFO ; apm_info.bios =APM_BIOS_INFO ; ist_info =IST_INFO ; saved_videomode =VIDEO_MODE ;
arch/x86_64/kernel/setup.c renamed from arch/x86_64/kernel/setup.c.old +0 -3
@@ -48,7 +48,6 @@#include <asm/smp.h> #include <asm/msr.h> #include <asm/desc.h> -#include <video/edid.h> #include <asm/e820.h> #include <asm/dma.h> #include <asm/mpspec.h>
@@ -100,7 +99,6 @@unsigned char table[0 ]; }; -struct edid_info edid_info;struct e820map e820;extern int root_mountflags;
@@ -523,7 +521,6 @@ROOT_DEV =old_decode_dev (ORIG_ROOT_DEV ); drive_info =DRIVE_INFO ; screen_info =SCREEN_INFO ; - edid_info =EDID_INFO ; saved_video_mode =SAVED_VIDEO_MODE ; bootloader_type =LOADER_TYPE ;
drivers/video/fbmon.c renamed from drivers/video/fbmon.c.old +0 -1
@@ -34,7 +34,6 @@#include <asm/prom.h> #include <asm/pci-bridge.h> #endif -#include <video/edid.h> #include "edid.h" /*
drivers/video/vesafb.c renamed from drivers/video/vesafb.c.old +0 -3
@@ -19,9 +19,6 @@#include <linux/fb.h> #include <linux/ioport.h> #include <linux/init.h> -#ifdef __i386__ -#include <video/edid.h> -#endif #include <asm/io.h> #include <asm/mtrr.h>
arch/i386/boot/compressed/misc.c renamed from arch/i386/boot/compressed/misc.c.old +0 -1
@@ -12,7 +12,6 @@#include <linux/linkage.h> #include <linux/vmalloc.h> #include <linux/tty.h> -#include <video/edid.h> #include <asm/io.h> #include <asm/page.h>
include/asm-x86_64/bootsetup.h renamed from include/asm-x86_64/bootsetup.h.old +0 -1
@@ -25,7 +25,6 @@#define KERNEL_START (*(unsigned int *) (PARAM+0x214))#define INITRD_START (*(unsigned int *) (PARAM+0x218))#define INITRD_SIZE (*(unsigned int *) (PARAM+0x21c)) -#define EDID_INFO (*(struct edid_info *) (PARAM+0x140))#define EDD_NR (*(unsigned char *) (PARAM+EDDNR))#define EDD_MBR_SIG_NR (*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF))#define EDD_MBR_SIGNATURE ((unsigned int *) (PARAM+EDD_MBR_SIG_BUF))
include/asm-i386/setup.h renamed from include/asm-i386/setup.h.old +0 -1
@@ -55,7 +55,6 @@#define KERNEL_START (*(unsigned long *) (PARAM+0x214))#define INITRD_START (*(unsigned long *) (PARAM+0x218))#define INITRD_SIZE (*(unsigned long *) (PARAM+0x21c)) -#define EDID_INFO (*(struct edid_info *) (PARAM+0x140))#define EDD_NR (*(unsigned char *) (PARAM+EDDNR))#define EDD_MBR_SIG_NR (*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF))#define EDD_MBR_SIGNATURE ((unsigned int *) (PARAM+EDD_MBR_SIG_BUF))
include/video/edid.h deleted +0 -27
@@ -1,27 +0,0 @@ -#ifndef __linux_video_edid_h__ -#define __linux_video_edid_h__ - -#ifdef __KERNEL__ - -#include <linux/config.h> -#ifdef CONFIG_PPC_OF -#include <linux/pci.h> -#endif - -#ifdef CONFIG_X86 -struct edid_info { -unsigned char dummy[128 ]; -}; - -extern struct edid_info edid_info; -extern char *get_EDID_from_BIOS (void *); - -#endif /* CONFIG_X86 */ - -#ifdef CONFIG_PPC_OF -extern char *get_EDID_from_OF (struct pci_dev *pdev); -#endif - -#endif /* __KERNEL__ */ - -#endif /* __linux_video_edid_h__ */
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
Quoted 120 lines · Adrian Bunk
This patch removes some completely unused code.
Signed-off-by Adrian Bunk <[email protected]>---
arch/i386/boot/compressed/misc.c | 1 - arch/i386/kernel/setup.c | 4 ---- arch/x86_64/kernel/setup.c | 3 --- drivers/video/fbmon.c | 1 - drivers/video/vesafb.c | 3 --- include/asm-i386/setup.h | 1 - include/asm-x86_64/bootsetup.h | 1 - include/video/edid.h | 27 --------------------------- 8 files changed, 41 deletions(-)--- linux-2.6.11-mm4-full/arch/i386/kernel/setup.c.old 2005-03-20
20:06:06.000000000 +0100 +++linux-2.6.11-mm4-full/arch/i386/kernel/setup.c2005-03-20
20:06:45.000000000 +0100 @@ -43,8 +43,6 @@
#include <linux/nodemask.h>
#include <linux/kexec.h>arch/i386/kernel/setup.c renamed from arch/i386/kernel/setup.c.old +0
-5-#include <video/edid.h> -#include <asm/apic.h> #include <asm/e820.h> #include <asm/mpspec.h> @@ -118,7 +116,6 @@unsigned short length;unsigned char table[0 ]; }; -struct edid_info edid_info;struct ist_info ist_info;struct e820map e820;@@ -1468,7 +1465,6 @@ROOT_DEV =old_decode_dev (ORIG_ROOT_DEV ); drive_info =DRIVE_INFO ; screen_info =SCREEN_INFO ; - edid_info =EDID_INFO ; apm_info.bios =APM_BIOS_INFO ; ist_info =IST_INFO ; saved_videomode =VIDEO_MODE ; --- linux-2.6.11-mm4-full/arch/x86_64/kernel/setup.c.old 2005-03-2020:04:42.000000000 +0100 +++
linux-2.6.11-mm4-full/arch/x86_64/kernel/setup.c2005-03-20
20:07:11.000000000 +0100 @@ -48,7 +48,6 @@
#include <asm/smp.h>
#include <asm/msr.h>
#include <asm/desc.h>arch/x86_64/kernel/setup.c renamed from arch/x86_64/kernel/setup.c.old +0
-4-#include <video/edid.h> #include <asm/e820.h> #include <asm/dma.h> #include <asm/mpspec.h> @@ -100,7 +99,6 @@unsigned char table[0 ]; }; -struct edid_info edid_info;struct e820map e820;extern int root_mountflags;@@ -523,7 +521,6 @@ROOT_DEV =old_decode_dev (ORIG_ROOT_DEV ); drive_info =DRIVE_INFO ; screen_info =SCREEN_INFO ; - edid_info =EDID_INFO ; saved_video_mode =SAVED_VIDEO_MODE ; bootloader_type =LOADER_TYPE ; --- linux-2.6.11-mm4-full/drivers/video/fbmon.c.old 2005-03-2020:03:56.000000000 +0100 +++
linux-2.6.11-mm4-full/drivers/video/fbmon.c2005-03-20 20:04:27.000000000
+0100 @@ -34,7 +34,6 @@
#include <asm/prom.h>
#include <asm/pci-bridge.h>
#endif
-#include <video/edid.h>
#include "edid.h"/*
--- linux-2.6.11-mm4-full/drivers/video/vesafb.c.old 2005-03-20
20:04:12.000000000 +0100 +++linux-2.6.11-mm4-full/drivers/video/vesafb.c2005-03-20 20:04:18.000000000
+0100 @@ -19,9 +19,6 @@
#include <linux/fb.h>
#include <linux/ioport.h>
#include <linux/init.h>drivers/video/vesafb.c renamed from drivers/video/vesafb.c.old +0
-4-#ifdef __i386__ -#include <video/edid.h> -#endif #include <asm/io.h> #include <asm/mtrr.h> --- linux-2.6.11-mm4-full/arch/i386/boot/compressed/misc.c.old 2005-03-2020:05:55.000000000 +0100 +++
linux-2.6.11-mm4-full/arch/i386/boot/compressed/misc.c2005-03-20
20:05:58.000000000 +0100 @@ -12,7 +12,6 @@
#include <linux/linkage.h>
#include <linux/vmalloc.h>
#include <linux/tty.h>
-#include <video/edid.h>
#include <asm/io.h>
#include <asm/page.h>--- linux-2.6.11-mm4-full/include/asm-x86_64/bootsetup.h.old 2005-03-20
20:07:33.000000000 +0100 +++linux-2.6.11-mm4-full/include/asm-x86_64/bootsetup.h2005-03-20
20:07:44.000000000 +0100 @@ -25,7 +25,6 @@
#defineKERNEL_START(*(unsigned int *) (PARAM+0x214)) #defineINITRD_START(*(unsigned int *) (PARAM+0x218)) #defineINITRD_SIZE(*(unsigned int *) (PARAM+0x21c))
-#defineEDID_INFO(*(structedid_info*) (PARAM+0x140))
#defineEDD_NR(*(unsigned char *) (PARAM+EDDNR))
#defineEDD_MBR_SIG_NR(*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF)) #defineEDD_MBR_SIGNATURE((unsigned int *) (PARAM+EDD_MBR_SIG_BUF))
--- linux-2.6.11-mm4-full/include/asm-i386/setup.h.old 2005-03-20
20:07:52.000000000 +0100 +++linux-2.6.11-mm4-full/include/asm-i386/setup.h2005-03-20
Quoted 8 lines
20:07:55.000000000 +0100 @@ -55,7 +55,6 @@
#defineKERNEL_START(*(unsigned long *) (PARAM+0x214)) #defineINITRD_START(*(unsigned long *) (PARAM+0x218)) #defineINITRD_SIZE(*(unsigned long *) (PARAM+0x21c))
-#defineEDID_INFO(*(structedid_info*) (PARAM+0x140))
#defineEDD_NR(*(unsigned char *) (PARAM+EDDNR))
#defineEDD_MBR_SIG_NR(*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF)) #defineEDD_MBR_SIGNATURE((unsigned int *) (PARAM+EDD_MBR_SIG_BUF))
Not this one. Code that grabs the EDID block using the video BIOS is in video.S. Currently, there's no driver that uses this but it's an acceptable backup for drivers that want the EDID block but has no i2c, or i2c probing fails.
Tony
PATCH 1/1 edid.h cleanups
Quoted 3 lines · Antonino A. Daplas
Not this one. Code that grabs the EDID block using the video BIOS is in
video.S. Currently, there's no driver that uses this but it's an acceptable backup for drivers that want the EDID block but has no i2c, or i2c probing fails.
OK, below are only the other parts of my patch.
Quoted 1 line
Tony
cu
Adrian
<-- snip -->
This patch contains the following cleanups:
- remove unneeded #include <video/edid.h>'s
- include/video/edid.h: kill two stale function prototypes
---
arch/i386/boot/compressed/misc.c | 1 - drivers/video/fbmon.c | 1 - drivers/video/vesafb.c | 3 --- include/video/edid.h | 9 --------- 4 files changed, 14 deletions(-)
drivers/video/fbmon.c renamed from drivers/video/fbmon.c.old +0 -1
@@ -34,7 +34,6 @@#include <asm/prom.h> #include <asm/pci-bridge.h> #endif -#include <video/edid.h> #include "edid.h" /*
drivers/video/vesafb.c renamed from drivers/video/vesafb.c.old +0 -3
@@ -19,9 +19,6 @@#include <linux/fb.h> #include <linux/ioport.h> #include <linux/init.h> -#ifdef __i386__ -#include <video/edid.h> -#endif #include <asm/io.h> #include <asm/mtrr.h>
arch/i386/boot/compressed/misc.c renamed from arch/i386/boot/compressed/misc.c.old +0 -1
@@ -12,7 +12,6 @@#include <linux/linkage.h> #include <linux/vmalloc.h> #include <linux/tty.h> -#include <video/edid.h> #include <asm/io.h> #include <asm/page.h>
include/video/edid.h renamed from include/video/edid.h.old +0 -9
@@ -4,9 +4,6 @@#ifdef __KERNEL__#include <linux/config.h> -#ifdef CONFIG_PPC_OF -#include <linux/pci.h> -#endif #ifdef CONFIG_X86 struct edid_info {
@@ -14,14 +11,8 @@ };extern struct edid_info edid_info; -extern char *get_EDID_from_BIOS (void *); -#endif /* CONFIG_X86 */ -#ifdef CONFIG_PPC_OF -extern char *get_EDID_from_OF (struct pci_dev *pdev); -#endif -#endif /* __KERNEL__ */ #endif /* __linux_video_edid_h__ */
-------------------------------------------------------
This SF.net email is sponsored by Microsoft Mobile & Embedded DevCon 2005 Attend MEDC 2005 May 9-12 in Vegas. Learn more about the latest Windows Embedded(r) & Windows Mobile(tm) platforms, applications & content. Register by 3/29 & save $300 http://ads.osdn.com/?ad_id=6883&alloc_id=15149&op=click