Messages in this thread Patch in this message | | | Date | Sat, 14 Aug 2004 16:28:28 +0200 | From | Christoph Hellwig <> | Subject | [PATCH] avoid riva_get_EDID unused variable warnings |
| |
split the three versions of the function into separate blocks, makes the code much cleaner aswell.
--- 1.62/drivers/video/riva/fbdev.c 2004-07-29 06:58:37 +02:00 +++ edited/drivers/video/riva/fbdev.c 2004-08-14 16:05:47 +02:00 @@ -1860,20 +1860,22 @@ var->accel_flags |= FB_ACCELF_TEXT; NVTRACE_LEAVE(); } - - +#ifdef CONFIG_PPC_OF static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev) { - struct riva_par *par; - int i; - NVTRACE_ENTER(); -#ifdef CONFIG_PPC_OF if (!riva_get_EDID_OF(info, pdev)) printk("rivafb: could not retrieve EDID from OF\n"); + NVTRACE_LEAVE(); +} #else - /* XXX use other methods later */ #ifdef CONFIG_FB_RIVA_I2C +static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev) +{ + struct riva_par *par; + int i; + + NVTRACE_ENTER(); par = (struct riva_par *) info->par; riva_create_i2c_busses(par); @@ -1885,11 +1887,14 @@ } } riva_delete_i2c_busses(par); -#endif -#endif NVTRACE_LEAVE(); } - +#else +static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev) +{ +} +#endif +#endif static void riva_get_edidinfo(struct fb_info *info) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |