fbdev: Fix warnings related to including <linux/export.h>
Subsystems (12)
Thomas Zimmermann
maintainerv2 cover fbdev: Fix warnings related to including <linux/export.h>
Some source files in fbdev do not include <linux/export.h> properly; others do when they don't have to. The build scripts warn about these cases.
Clean up to fix the related warnings. While at it, also fix trailing whitespaces in the affected files.
v2:
- remove unused functions (Helge)
Thomas Zimmermann (14):
fbdev: Remove trailing whitespaces
fbdev: Include <linux/export.h>
fbdev/c2p: Include <linux/export.h>
fbdev/cyber2000fb: Unexport symbols
fbdev/matroxfb: Remove trailing whitespaces
fbdev/matroxfb: Include <linux/export.h>
fbdev/omap: Include <linux/export.h>
fbdev/omap2: Include <linux/export.h>
fbdev/omap2: Do not include <linux/export.h>
fbdev/mb862xx: Do not include <linux/export.h>
fbdev/pxafb: Unexport symbol
fbdev/sisfb: Unexport symbols
fbdev/viafb: Include <linux/export.h>
fbdev/viafb: Do not include <linux/export.h>
drivers/video/fbdev/c2p_iplan2.c | 1 + drivers/video/fbdev/c2p_planar.c | 1 + drivers/video/fbdev/core/cfbcopyarea.c | 2 + drivers/video/fbdev/core/cfbfillrect.c | 2 + drivers/video/fbdev/core/cfbimgblt.c | 2 + drivers/video/fbdev/core/fb_ddc.c | 1 + drivers/video/fbdev/core/fb_defio.c | 1 + drivers/video/fbdev/core/fb_io_fops.c | 1 + drivers/video/fbdev/core/fb_sys_fops.c | 2 + drivers/video/fbdev/core/fbcmap.c | 1 + drivers/video/fbdev/core/fbcon.c | 1 + drivers/video/fbdev/core/fbmon.c | 2 + drivers/video/fbdev/core/modedb.c | 1 + drivers/video/fbdev/core/svgalib.c | 1 + drivers/video/fbdev/core/syscopyarea.c | 2 + drivers/video/fbdev/core/sysfillrect.c | 2 + drivers/video/fbdev/core/sysimgblt.c | 2 + drivers/video/fbdev/cyber2000fb.c | 36 ----------- drivers/video/fbdev/cyber2000fb.h | 2 - drivers/video/fbdev/macmodes.c | 3 +- drivers/video/fbdev/matrox/g450_pll.c | 26 ++++---- drivers/video/fbdev/matrox/matroxfb_DAC1064.c | 47 +++++++------- drivers/video/fbdev/matrox/matroxfb_Ti3026.c | 1 + drivers/video/fbdev/matrox/matroxfb_accel.c | 2 + drivers/video/fbdev/matrox/matroxfb_base.c | 1 + drivers/video/fbdev/matrox/matroxfb_g450.c | 62 ++++++++++--------- drivers/video/fbdev/matrox/matroxfb_misc.c | 21 ++++--- drivers/video/fbdev/mb862xx/mb862xx-i2c.c | 1 - drivers/video/fbdev/omap/lcd_dma.c | 1 + drivers/video/fbdev/omap/lcdc.c | 2 + drivers/video/fbdev/omap/omapfb_main.c | 2 + drivers/video/fbdev/omap2/omapfb/dss/apply.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/core.c | 1 + .../fbdev/omap2/omapfb/dss/dispc-compat.c | 1 + .../video/fbdev/omap2/omapfb/dss/display.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 1 - drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 1 + .../fbdev/omap2/omapfb/dss/dss_features.c | 1 + .../video/fbdev/omap2/omapfb/dss/manager.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/output.c | 1 + .../video/fbdev/omap2/omapfb/dss/overlay.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 1 - drivers/video/fbdev/omap2/omapfb/dss/venc.c | 1 + .../video/fbdev/omap2/omapfb/omapfb-ioctl.c | 1 - drivers/video/fbdev/omap2/omapfb/vrfb.c | 1 + drivers/video/fbdev/pxafb.c | 17 +---- drivers/video/fbdev/sbuslib.c | 1 + drivers/video/fbdev/sis/sis.h | 2 - drivers/video/fbdev/sis/sis_main.c | 25 -------- drivers/video/fbdev/via/via-core.c | 1 + drivers/video/fbdev/via/via-gpio.c | 1 - drivers/video/fbdev/via/via_i2c.c | 1 + drivers/video/fbdev/wmt_ge_rops.c | 1 + include/linux/platform_data/video-pxafb.h | 1 - include/video/sisfb.h | 6 -- 55 files changed, 134 insertions(+), 168 deletions(-)
Signature · 1 line
2.49.0
Thomas Zimmermann
maintainerPATCH v2 1/14 fbdev: Remove trailing whitespaces
Fix coding style.
--- drivers/video/fbdev/macmodes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/macmodes.c +1 -1
@@ -236,7 +236,7 @@ int mac_vmode_to_var(int vmode, int cmode, struct fb_var_screeninfo *var)case CMODE_8 : var->bits_per_pixel =8 ; var->red.offset =0 ; - var->red.length =8 ; + var->red.length =8 ; var->green.offset =0 ; var->green.length =8 ; var->blue.offset =0 ;
Signature · 1 line
2.49.0
Thomas Zimmermann
maintainerPATCH v2 2/14 fbdev: Include <linux/export.h>
In reply to Thomas ZimmermannFix the compile-time warnings
drivers/video/fbdev/core/cfbcopyarea.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/cfbfillrect.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/cfbimgblt.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/fb_ddc.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/fb_defio.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/fb_io_fops.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/fb_sys_fops.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/fbcmap.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/fbcon.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/fbmon.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/modedb.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/svgalib.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/syscopyarea.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/sysfillrect.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/core/sysimgblt.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/macmodes.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/sbuslib.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/wmt_ge_rops.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing
--- drivers/video/fbdev/core/cfbcopyarea.c | 2 ++ drivers/video/fbdev/core/cfbfillrect.c | 2 ++ drivers/video/fbdev/core/cfbimgblt.c | 2 ++ drivers/video/fbdev/core/fb_ddc.c | 1 + drivers/video/fbdev/core/fb_defio.c | 1 + drivers/video/fbdev/core/fb_io_fops.c | 1 + drivers/video/fbdev/core/fb_sys_fops.c | 2 ++ drivers/video/fbdev/core/fbcmap.c | 1 + drivers/video/fbdev/core/fbcon.c | 1 + drivers/video/fbdev/core/fbmon.c | 2 ++ drivers/video/fbdev/core/modedb.c | 1 + drivers/video/fbdev/core/svgalib.c | 1 + drivers/video/fbdev/core/syscopyarea.c | 2 ++ drivers/video/fbdev/core/sysfillrect.c | 2 ++ drivers/video/fbdev/core/sysimgblt.c | 2 ++ drivers/video/fbdev/macmodes.c | 1 + drivers/video/fbdev/sbuslib.c | 1 + drivers/video/fbdev/wmt_ge_rops.c | 1 + 18 files changed, 26 insertions(+)
drivers/video/fbdev/core/cfbcopyarea.c +2 -0
@@ -2,6 +2,8 @@/* * Copyright (C) 2025 Zsolt Kajtar ([email protected]) */ + +#include <linux/export.h> #include <linux/module.h> #include <linux/fb.h> #include <linux/bitrev.h>
drivers/video/fbdev/core/cfbfillrect.c +2 -0
@@ -2,6 +2,8 @@/* * Copyright (C) 2025 Zsolt Kajtar ([email protected]) */ + +#include <linux/export.h> #include <linux/module.h> #include <linux/fb.h> #include <linux/bitrev.h>
drivers/video/fbdev/core/cfbimgblt.c +2 -0
@@ -2,6 +2,8 @@/* * Copyright (C) 2025 Zsolt Kajtar ([email protected]) */ + +#include <linux/export.h> #include <linux/module.h> #include <linux/fb.h> #include <linux/bitrev.h>
drivers/video/fbdev/core/fb_ddc.c +1 -0
@@ -10,6 +10,7 @@#include <linux/delay.h> #include <linux/device.h> +#include <linux/export.h> #include <linux/module.h> #include <linux/fb.h> #include <linux/i2c-algo-bit.h>
drivers/video/fbdev/core/fb_defio.c +1 -0
@@ -11,6 +11,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h> +#include <linux/export.h> #include <linux/string.h> #include <linux/mm.h> #include <linux/vmalloc.h>
drivers/video/fbdev/core/fb_io_fops.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 +#include <linux/export.h> #include <linux/fb.h> #include <linux/module.h> #include <linux/uaccess.h>
drivers/video/fbdev/core/fb_sys_fops.c +2 -0
@@ -9,6 +9,8 @@* for more details. * */ + +#include <linux/export.h> #include <linux/fb.h> #include <linux/module.h> #include <linux/uaccess.h>
drivers/video/fbdev/core/fbcmap.c +1 -0
@@ -11,6 +11,7 @@* more details. */ +#include <linux/export.h> #include <linux/string.h> #include <linux/module.h> #include <linux/fb.h>
drivers/video/fbdev/core/fbcon.c +1 -0
@@ -56,6 +56,7 @@* more details. */ +#include <linux/export.h> #include <linux/module.h> #include <linux/types.h> #include <linux/fs.h>
drivers/video/fbdev/core/fbmon.c +2 -0
@@ -26,6 +26,8 @@* for more details. * */ + +#include <linux/export.h> #include <linux/fb.h> #include <linux/module.h> #include <linux/pci.h>
drivers/video/fbdev/core/modedb.c +1 -0
@@ -11,6 +11,7 @@* more details. */ +#include <linux/export.h> #include <linux/module.h> #include <linux/slab.h> #include <linux/fb.h>
drivers/video/fbdev/core/svgalib.c +1 -0
@@ -10,6 +10,7 @@* Some parts are based on David Boucher's viafb (http://davesdomain.org.uk/viafb/) */ +#include <linux/export.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/string.h>
drivers/video/fbdev/core/syscopyarea.c +2 -0
@@ -2,6 +2,8 @@/* * Copyright (C) 2025 Zsolt Kajtar ([email protected]) */ + +#include <linux/export.h> #include <linux/module.h> #include <linux/fb.h> #include <linux/bitrev.h>
drivers/video/fbdev/core/sysfillrect.c +2 -0
@@ -2,6 +2,8 @@/* * Copyright (C) 2025 Zsolt Kajtar ([email protected]) */ + +#include <linux/export.h> #include <linux/module.h> #include <linux/fb.h> #include <linux/bitrev.h>
drivers/video/fbdev/core/sysimgblt.c +2 -0
@@ -2,6 +2,8 @@/* * Copyright (C) 2025 Zsolt Kajtar ([email protected]) */ + +#include <linux/export.h> #include <linux/module.h> #include <linux/fb.h> #include <linux/bitrev.h>
drivers/video/fbdev/macmodes.c +1 -0
@@ -16,6 +16,7 @@*/ #include <linux/errno.h> +#include <linux/export.h> #include <linux/fb.h> #include <linux/string.h> #include <linux/module.h>
drivers/video/fbdev/sbuslib.c +1 -0
@@ -5,6 +5,7 @@*/ #include <linux/compat.h> +#include <linux/export.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/string.h>
drivers/video/fbdev/wmt_ge_rops.c +1 -0
@@ -7,6 +7,7 @@* Copyright (C) 2010 Alexey Charkov <[email protected]> */ +#include <linux/export.h> #include <linux/module.h> #include <linux/fb.h> #include <linux/io.h>
Signature · 1 line
2.49.0
Thomas Zimmermann
maintainerPATCH v2 3/14 fbdev/c2p: Include <linux/export.h>
In reply to Thomas ZimmermannFix the compile-time warnings
drivers/video/fbdev/c2p_iplan2.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/c2p_planar.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing
--- drivers/video/fbdev/c2p_iplan2.c | 1 + drivers/video/fbdev/c2p_planar.c | 1 + 2 files changed, 2 insertions(+)
drivers/video/fbdev/c2p_iplan2.c +1 -0
@@ -8,6 +8,7 @@* for more details. */ +#include <linux/export.h> #include <linux/module.h> #include <linux/string.h>
drivers/video/fbdev/c2p_planar.c +1 -0
@@ -8,6 +8,7 @@* for more details. */ +#include <linux/export.h> #include <linux/module.h> #include <linux/string.h>
Signature · 1 line
2.49.0
Thomas Zimmermann
maintainerPATCH v2 4/14 fbdev/cyber2000fb: Unexport symbols
In reply to Thomas ZimmermannFix the compile-time warning
drivers/video/fbdev/cyber2000fb.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing
The affected symbols are not used anywhere, so remove the functions entirely.
v2:
- remove unused functions (Helge)
--- drivers/video/fbdev/cyber2000fb.c | 36 ------------------------------- drivers/video/fbdev/cyber2000fb.h | 2 -- 2 files changed, 38 deletions(-)
drivers/video/fbdev/cyber2000fb.c +0 -36
@@ -1089,7 +1089,6 @@ void cyber2000fb_enable_extregs(struct cfb_info *cfb)cyber2000_grphw (EXT_FUNC_CTL , old, cfb); } } -EXPORT_SYMBOL (cyber2000fb_enable_extregs);/* * Disable access to the extended registers
@@ -1109,41 +1108,6 @@ void cyber2000fb_disable_extregs(struct cfb_info *cfb)else cfb->func_use_count -=1 ; } -EXPORT_SYMBOL (cyber2000fb_disable_extregs); - -/* -* Attach a capture/tv driver to the core CyberX0X0 driver. -*/ -int cyber2000fb_attach (struct cyberpro_info *info,int idx) -{ -if (int_cfb_info !=NULL ) { - info->dev = int_cfb_info->fb.device; -#ifdef CONFIG_FB_CYBER2000_I2C - info->i2c = &int_cfb_info->i2c_adapter; -#else - info->i2c =NULL ; -#endif - info->regs = int_cfb_info->regs; - info->irq = int_cfb_info->irq; - info->fb = int_cfb_info->fb.screen_base; - info->fb_size = int_cfb_info->fb.fix.smem_len; - info->info = int_cfb_info; - -strscpy (info->dev_name, int_cfb_info->fb.fix.id, -sizeof (info->dev_name)); - } - -return int_cfb_info !=NULL ; -} -EXPORT_SYMBOL (cyber2000fb_attach); - -/* -* Detach a capture/tv driver from the core CyberX0X0 driver. -*/ -void cyber2000fb_detach (int idx) -{ -} -EXPORT_SYMBOL (cyber2000fb_detach);#ifdef CONFIG_FB_CYBER2000_DDC
drivers/video/fbdev/cyber2000fb.h +0 -2
@@ -488,7 +488,5 @@ struct cyberpro_info {* Note! Writing to the Cyber20x0 registers from an interrupt * routine is definitely a bad idea atm. */ -int cyber2000fb_attach (struct cyberpro_info *info,int idx); -void cyber2000fb_detach (int idx);void cyber2000fb_enable_extregs (struct cfb_info *cfb);void cyber2000fb_disable_extregs (struct cfb_info *cfb);
Signature · 1 line
2.49.0
Re: [PATCH v2 04/14] fbdev/cyber2000fb: Unexport symbols
Quoted 7 lines · Thomas Zimmermann
Fix the compile-time warning
drivers/video/fbdev/cyber2000fb.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingThe affected symbols are not used anywhere, so remove the functions entirely.
Quoted 8 lines
v2:
- remove unused functions (Helge)Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/video/fbdev/cyber2000fb.c | 36 ------------------------------- drivers/video/fbdev/cyber2000fb.h | 2 -- 2 files changed, 38 deletions(-)
Thomas Zimmermann
maintainerPATCH v2 5/14 fbdev/matroxfb: Remove trailing whitespaces
In reply to Thomas ZimmermannFix coding style.
--- drivers/video/fbdev/matrox/g450_pll.c | 24 ++++---- drivers/video/fbdev/matrox/matroxfb_DAC1064.c | 46 +++++++------- drivers/video/fbdev/matrox/matroxfb_g450.c | 60 +++++++++---------- drivers/video/fbdev/matrox/matroxfb_misc.c | 20 +++---- 4 files changed, 75 insertions(+), 75 deletions(-)
drivers/video/fbdev/matrox/g450_pll.c +12 -12
@@ -258,13 +258,13 @@ static inline unsigned int g450_findworkingpll(struct matrox_fb_info *minfo,unsigned int found =0 ;unsigned int idx;unsigned int mnpfound = mnparray[0 ]; - +for (idx =0 ; idx < mnpcount; idx++) {unsigned int sarray[3 ];unsigned int *sptr; {unsigned int mnp; - + sptr = sarray; mnp = mnparray[idx];if (mnp &0x38 ) {
@@ -277,7 +277,7 @@ static inline unsigned int g450_findworkingpll(struct matrox_fb_info *minfo, }while (sptr >= sarray) {unsigned int mnp = *sptr--; - + if (g450_testpll(minfo, mnp - 0x0300, pll) && g450_testpll(minfo, mnp + 0x0300, pll) && g450_testpll(minfo, mnp - 0x0200, pll) &&
@@ -310,12 +310,12 @@ static int g450_checkcache(struct matrox_fb_info *minfo, struct matrox_pll_cache *ci, unsigned int mnp_key) {unsigned int i; - + mnp_key &=G450_MNP_FREQBITS ;for (i =0 ; i < ci->valid; i++) {if (ci->data[i].mnp_key == mnp_key) {unsigned int mnp; - + mnp = ci->data[i].mnp_value;if (i) {memmove (ci->data +1 , ci->data, i *sizeof (*ci->data));
@@ -343,7 +343,7 @@ static int __g450_setclk(struct matrox_fb_info *minfo, unsigned int fout, {u_int8_t tmp, xpwrctrl;unsigned long flags; - +matroxfb_DAC_lock_irqsave (flags); xpwrctrl =matroxfb_DAC_in (minfo,M1064_XPWRCTRL );
@@ -375,7 +375,7 @@ static int __g450_setclk(struct matrox_fb_info *minfo, unsigned int fout, } {u_int8_t misc; - + misc =mga_inb (M_MISC_REG_READ ) & ~0x0C ;switch (pll) {case M_PIXEL_PLL_A :
@@ -409,13 +409,13 @@ static int __g450_setclk(struct matrox_fb_info *minfo, unsigned int fout,u_int8_t tmp;unsigned int mnp;unsigned long flags; - +matroxfb_DAC_lock_irqsave (flags); tmp =matroxfb_DAC_in (minfo,M1064_XPWRCTRL );if (!(tmp &2 )) {matroxfb_DAC_out (minfo,M1064_XPWRCTRL , tmp |2 ); } - + mnp =matroxfb_DAC_in (minfo,M1064_XPIXPLLCM ) <<16 ; mnp |=matroxfb_DAC_in (minfo,M1064_XPIXPLLCN ) <<8 ;matroxfb_DAC_unlock_irqrestore (flags);
@@ -441,7 +441,7 @@ static int __g450_setclk(struct matrox_fb_info *minfo, unsigned int fout, delta =pll_freq_delta (fout,g450_vco2f (mnp, vco));for (idx = mnpcount; idx >0 ; idx--) {/* == is important; due to nextpll algorithm we get -sorted equally good frequencies from lower VCO +sorted equally good frequencies from lower VCO frequency to higher - with <= lowest wins, while with < highest one wins */ if (delta <= deltaarray[idx-1 ]) {
@@ -472,7 +472,7 @@ static int __g450_setclk(struct matrox_fb_info *minfo, unsigned int fout, {unsigned long flags;unsigned int mnp; - +matroxfb_DAC_lock_irqsave (flags); mnp =g450_checkcache (minfo, ci, mnparray[0 ]);if (mnp !=NO_MORE_MNP ) {
@@ -495,7 +495,7 @@ int matroxfb_g450_setclk(struct matrox_fb_info *minfo, unsigned int fout, unsigned int pll) {unsigned int * arr; - + arr =kmalloc (sizeof (*arr) *MNP_TABLE_SIZE *2 ,GFP_KERNEL );if (arr) {int r;
drivers/video/fbdev/matrox/matroxfb_DAC1064.c +23 -23
152 lines not on this page · raw message
drivers/video/fbdev/matrox/matroxfb_g450.c +30 -30
196 lines not on this page · raw message
drivers/video/fbdev/matrox/matroxfb_misc.c +10 -10
@@ -390,7 +390,7 @@ void matroxfb_vgaHWrestore(struct matrox_fb_info *minfo)static void get_pins (unsigned char __iomem * pins,struct matrox_bios * bd) {unsigned int b0 =readb (pins); - +if (b0 ==0x2E &&readb (pins+1 ) ==0x41 ) {unsigned int pins_len =readb (pins+2 );unsigned int i;
@@ -426,7 +426,7 @@ static void get_pins(unsigned char __iomem* pins, struct matrox_bios* bd) {static void get_bios_version (unsigned char __iomem * vbios,struct matrox_bios * bd) {unsigned int pcir_offset; - + pcir_offset =readb (vbios +24 ) | (readb (vbios +25 ) <<8 ); if (pcir_offset >= 26 && pcir_offset < 0xFFE0 && readb(vbios + pcir_offset ) == 'P' &&
@@ -451,7 +451,7 @@ static void get_bios_version(unsigned char __iomem * vbios, struct matrox_bios*static void get_bios_output (unsigned char __iomem * vbios,struct matrox_bios * bd) {unsigned char b; - + b =readb (vbios +0x7FF1 );if (b ==0xFF ) { b =0 ;
@@ -461,7 +461,7 @@ static void get_bios_output(unsigned char __iomem* vbios, struct matrox_bios* bdstatic void get_bios_tvout (unsigned char __iomem * vbios,struct matrox_bios * bd) {unsigned int i; - +/* Check for 'IBM .*(V....TVO' string - it means TVO BIOS */ bd->output.tvout =0 ; if (readb(vbios + 0x1D) != 'I' ||
@@ -472,7 +472,7 @@ static void get_bios_tvout(unsigned char __iomem* vbios, struct matrox_bios* bd) }for (i =0x2D ; i <0x2D +128 ; i++) {unsigned char b =readb (vbios + i); - +if (b =='(' &&readb (vbios + i +1 ) =='V' ) { if (readb(vbios + i + 6) == 'T' && readb(vbios + i + 7) == 'V' &&
@@ -488,7 +488,7 @@ static void get_bios_tvout(unsigned char __iomem* vbios, struct matrox_bios* bd)static void parse_bios (unsigned char __iomem * vbios,struct matrox_bios * bd) {unsigned int pins_offset; - +if (readb (vbios) !=0x55 ||readb (vbios +1 ) !=0xAA ) {return ; }
@@ -648,9 +648,9 @@ static int parse_pins5(struct matrox_fb_info *minfo, const struct matrox_bios *bd) {unsigned int mult; - + mult = bd->pins[4 ]?8000 :6000 ; - + minfo->limits.pixel.vcomax = (bd->pins[38 ] ==0xFF ) ?600000 : bd->pins[38 ] * mult; minfo->limits.system.vcomax = (bd->pins[36 ] ==0xFF ) ? minfo->limits.pixel.vcomax : bd->pins[36 ] * mult; minfo->limits.video.vcomax = (bd->pins[37 ] ==0xFF ) ? minfo->limits.system.vcomax : bd->pins[37 ] * mult;
@@ -770,7 +770,7 @@ void matroxfb_read_pins(struct matrox_fb_info *minfo)u32 biosbase;u32 fbbase;struct pci_dev *pdev = minfo->pcidev; - +memset (&minfo->bios,0 ,sizeof (minfo->bios));pci_read_config_dword (pdev,PCI_OPTION_REG , &opt);pci_write_config_dword (pdev,PCI_OPTION_REG , opt |PCI_OPTION_ENABLE_ROM );
@@ -790,7 +790,7 @@ void matroxfb_read_pins(struct matrox_fb_info *minfo) }else {unsigned int ven =readb (b+0x64 +0 ) | (readb (b+0x64 +1 ) <<8 );unsigned int dev =readb (b+0x64 +2 ) | (readb (b+0x64 +3 ) <<8 ); - +if (ven != pdev->vendor || dev != pdev->device) {printk (KERN_INFO "matroxfb: Legacy BIOS is for %04X:%04X, while this device is %04X:%04X\n" , ven, dev, pdev->vendor, pdev->device);
Signature · 1 line
2.49.0
Thomas Zimmermann
maintainerPATCH v2 6/14 fbdev/matroxfb: Include <linux/export.h>
In reply to Thomas ZimmermannFix the compile-time warnings
drivers/video/fbdev/matrox/g450_pll.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/matrox/matroxfb_DAC1064.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/matrox/matroxfb_Ti3026.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/matrox/matroxfb_accel.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/matrox/matroxfb_base.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/matrox/matroxfb_g450.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/matrox/matroxfb_misc.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing
--- drivers/video/fbdev/matrox/g450_pll.c | 2 ++ drivers/video/fbdev/matrox/matroxfb_DAC1064.c | 1 + drivers/video/fbdev/matrox/matroxfb_Ti3026.c | 1 + drivers/video/fbdev/matrox/matroxfb_accel.c | 2 ++ drivers/video/fbdev/matrox/matroxfb_base.c | 1 + drivers/video/fbdev/matrox/matroxfb_g450.c | 2 ++ drivers/video/fbdev/matrox/matroxfb_misc.c | 1 + 7 files changed, 10 insertions(+)
drivers/video/fbdev/matrox/g450_pll.c +2 -0
@@ -14,6 +14,8 @@* */ +#include <linux/export.h> +#include "g450_pll.h" #include "matroxfb_DAC1064.h"
drivers/video/fbdev/matrox/matroxfb_DAC1064.c +1 -0
@@ -13,6 +13,7 @@* */ +#include <linux/export.h> #include "matroxfb_DAC1064.h" #include "matroxfb_misc.h"
drivers/video/fbdev/matrox/matroxfb_Ti3026.c +1 -0
@@ -79,6 +79,7 @@* */ +#include <linux/export.h> #include "matroxfb_Ti3026.h" #include "matroxfb_misc.h"
drivers/video/fbdev/matrox/matroxfb_accel.c +2 -0
@@ -77,6 +77,8 @@* */ +#include <linux/export.h> +#include "matroxfb_accel.h" #include "matroxfb_DAC1064.h" #include "matroxfb_Ti3026.h"
drivers/video/fbdev/matrox/matroxfb_base.c +1 -0
@@ -101,6 +101,7 @@*/ #include <linux/aperture.h> +#include <linux/export.h> #include <linux/version.h> #include "matroxfb_base.h"
drivers/video/fbdev/matrox/matroxfb_g450.c +2 -0
@@ -13,6 +13,8 @@* */ +#include <linux/export.h> +#include "matroxfb_base.h" #include "matroxfb_misc.h" #include "matroxfb_DAC1064.h"
drivers/video/fbdev/matrox/matroxfb_misc.c +1 -0
@@ -85,6 +85,7 @@* */ +#include <linux/export.h> #include "matroxfb_misc.h" #include <linux/interrupt.h>
Signature · 1 line
2.49.0
Thomas Zimmermann
maintainerPATCH v2 7/14 fbdev/omap: Include <linux/export.h>
In reply to Thomas ZimmermannFix the compile-time warnings
drivers/video/fbdev/omap/lcd_dma.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap/lcdc.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap/omapfb_main.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing
--- drivers/video/fbdev/omap/lcd_dma.c | 1 + drivers/video/fbdev/omap/lcdc.c | 2 ++ drivers/video/fbdev/omap/omapfb_main.c | 2 ++ 3 files changed, 5 insertions(+)
drivers/video/fbdev/omap/lcd_dma.c +1 -0
@@ -18,6 +18,7 @@* Support functions for the OMAP internal DMA channels. */ +#include <linux/export.h> #include <linux/module.h> #include <linux/spinlock.h> #include <linux/interrupt.h>
drivers/video/fbdev/omap/lcdc.c +2 -0
@@ -5,8 +5,10 @@* Copyright (C) 2004 Nokia Corporation * Author: Imre Deak <[email protected]> */ +#include <linux/module.h> #include <linux/device.h> +#include <linux/export.h> #include <linux/interrupt.h> #include <linux/spinlock.h> #include <linux/err.h>
drivers/video/fbdev/omap/omapfb_main.c +2 -0
@@ -11,6 +11,8 @@* Dirk Behme <[email protected]> - changes for 2.6 kernel API * Texas Instruments - H3 support */ + +#include <linux/export.h> #include <linux/platform_device.h> #include <linux/mm.h> #include <linux/slab.h>
Signature · 1 line
2.49.0
Thomas Zimmermann
maintainerPATCH v2 8/14 fbdev/omap2: Include <linux/export.h>
In reply to Thomas ZimmermannFix the compile-time warnings
drivers/video/fbdev/omap2/omapfb/dss/apply.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/dss/core.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/dss/display.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/dss/dss-of.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/dss/dss_features.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/dss/manager.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/dss/output.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/dss/overlay.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/dss/venc.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/omap2/omapfb/vrfb.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing
--- drivers/video/fbdev/omap2/omapfb/dss/apply.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/core.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/display.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/dss_features.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/manager.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/output.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 1 + drivers/video/fbdev/omap2/omapfb/vrfb.c | 1 + 11 files changed, 11 insertions(+)
drivers/video/fbdev/omap2/omapfb/dss/apply.c +1 -0
@@ -6,6 +6,7 @@#define DSS_SUBSYS_NAME "APPLY" +#include <linux/export.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/slab.h>
drivers/video/fbdev/omap2/omapfb/dss/core.c +1 -0
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/clk.h> #include <linux/err.h> +#include <linux/export.h> #include <linux/platform_device.h> #include <linux/seq_file.h> #include <linux/debugfs.h>
drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c +1 -0
@@ -6,6 +6,7 @@#define DSS_SUBSYS_NAME "APPLY" +#include <linux/export.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/slab.h>
drivers/video/fbdev/omap2/omapfb/dss/display.c +1 -0
@@ -11,6 +11,7 @@#define DSS_SUBSYS_NAME "DISPLAY" +#include <linux/export.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/jiffies.h>
drivers/video/fbdev/omap2/omapfb/dss/dss-of.c +1 -0
@@ -6,6 +6,7 @@#include <linux/device.h> #include <linux/err.h> +#include <linux/export.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_graph.h>
drivers/video/fbdev/omap2/omapfb/dss/dss_features.c +1 -0
@@ -6,6 +6,7 @@* Author: Archit Taneja <[email protected]> */ +#include <linux/export.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/types.h>
drivers/video/fbdev/omap2/omapfb/dss/manager.c +1 -0
@@ -11,6 +11,7 @@#define DSS_SUBSYS_NAME "MANAGER" +#include <linux/export.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/module.h>
drivers/video/fbdev/omap2/omapfb/dss/output.c +1 -0
@@ -4,6 +4,7 @@* Author: Archit Taneja <[email protected]> */ +#include <linux/export.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h>
drivers/video/fbdev/omap2/omapfb/dss/overlay.c +1 -0
@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/err.h> +#include <linux/export.h> #include <linux/sysfs.h> #include <linux/platform_device.h> #include <linux/delay.h>
drivers/video/fbdev/omap2/omapfb/dss/venc.c +1 -0
@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/clk.h> #include <linux/err.h> +#include <linux/export.h> #include <linux/io.h> #include <linux/mutex.h> #include <linux/completion.h>
drivers/video/fbdev/omap2/omapfb/vrfb.c +1 -0
@@ -9,6 +9,7 @@/*#define DEBUG*/ #include <linux/err.h> +#include <linux/export.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/ioport.h>
Signature · 1 line
2.49.0
Re: [PATCH v2 08/14] fbdev/omap2: Include <linux/export.h>
Quoted 15 lines · Thomas Zimmermann
Fix the compile-time warnings
drivers/video/fbdev/omap2/omapfb/dss/apply.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/dss/core.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/dss/display.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/dss/dss-of.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/dss/dss_features.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/dss/manager.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/dss/output.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/dss/overlay.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/dss/venc.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/omap2/omapfb/vrfb.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingSigned-off-by Thomas Zimmermann <[email protected]>
Quoted 13 lines
--- drivers/video/fbdev/omap2/omapfb/dss/apply.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/core.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/display.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/dss_features.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/manager.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/output.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 1 + drivers/video/fbdev/omap2/omapfb/vrfb.c | 1 + 11 files changed, 11 insertions(+)
Thomas Zimmermann
maintainerPATCH v2 9/14 fbdev/omap2: Do not include <linux/export.h>
In reply to Thomas ZimmermannFix the compile-time warnings
drivers/video/fbdev/omap2/omapfb/dss/dpi.c: warning: EXPORT_SYMBOL() is not used, but #include <linux/export.h> is present drivers/video/fbdev/omap2/omapfb/dss/sdi.c: warning: EXPORT_SYMBOL() is not used, but #include <linux/export.h> is present drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c: warning: EXPORT_SYMBOL() is not used, but #include <linux/export.h> is present
--- drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 1 - drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 1 - drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 1 - 3 files changed, 3 deletions(-)
drivers/video/fbdev/omap2/omapfb/dss/dpi.c +0 -1
@@ -13,7 +13,6 @@#include <linux/kernel.h> #include <linux/delay.h> -#include <linux/export.h> #include <linux/err.h> #include <linux/errno.h> #include <linux/platform_device.h>
drivers/video/fbdev/omap2/omapfb/dss/sdi.c +0 -1
@@ -12,7 +12,6 @@#include <linux/delay.h> #include <linux/err.h> #include <linux/regulator/consumer.h> -#include <linux/export.h> #include <linux/platform_device.h> #include <linux/string.h> #include <linux/of.h>
drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c +0 -1
@@ -16,7 +16,6 @@#include <linux/mm.h> #include <linux/omapfb.h> #include <linux/vmalloc.h> -#include <linux/export.h> #include <linux/sizes.h> #include <video/omapfb_dss.h>
Signature · 1 line
2.49.0
Re: [PATCH v2 09/14] fbdev/omap2: Do not include <linux/export.h>
Quoted 6 lines · Thomas Zimmermann
Fix the compile-time warnings
drivers/video/fbdev/omap2/omapfb/dss/dpi.c: warning:EXPORT_SYMBOL()is not used, but #include <linux/export.h> is presentdrivers/video/fbdev/omap2/omapfb/dss/sdi.c: warning:EXPORT_SYMBOL()is not used, but #include <linux/export.h> is presentdrivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c: warning:EXPORT_SYMBOL()is not used, but #include <linux/export.h> is present
Quoted 6 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 1 - drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 1 - drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 1 - 3 files changed, 3 deletions(-)
Thomas Zimmermann
maintainerPATCH v2 10/14 fbdev/mb862xx: Do not include <linux/export.h>
In reply to Thomas ZimmermannFix the compile-time warning
drivers/video/fbdev/mb862xx/mb862xx-i2c.c: warning: EXPORT_SYMBOL() is not used, but #include <linux/export.h> is present
--- drivers/video/fbdev/mb862xx/mb862xx-i2c.c | 1 - 1 file changed, 1 deletion(-)
drivers/video/fbdev/mb862xx/mb862xx-i2c.c +0 -1
@@ -9,7 +9,6 @@#include <linux/i2c.h> #include <linux/io.h> #include <linux/delay.h> -#include <linux/export.h> #include "mb862xxfb.h" #include "mb862xx_reg.h"
Signature · 1 line
2.49.0
Re: [PATCH v2 10/14] fbdev/mb862xx: Do not include <linux/export.h>
Quoted 8 lines · Thomas Zimmermann
Fix the compile-time warning
drivers/video/fbdev/mb862xx/mb862xx-i2c.c: warning:EXPORT_SYMBOL()is not used, but #include <linux/export.h> is presentSigned-off-by Thomas Zimmermann <[email protected]>--- drivers/video/fbdev/mb862xx/mb862xx-i2c.c | 1 - 1 file changed, 1 deletion(-)
Thomas Zimmermann
maintainerPATCH v2 11/14 fbdev/pxafb: Unexport symbol
In reply to Thomas ZimmermannFix the compile-time warning
drivers/video/fbdev/pxafb.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing
The affected symbol is not used anywhere, so remove the function entirely.
v2:
- remove unused functions (Helge)
--- drivers/video/fbdev/pxafb.c | 17 ++--------------- include/linux/platform_data/video-pxafb.h | 1 - 2 files changed, 2 insertions(+), 16 deletions(-)
drivers/video/fbdev/pxafb.c +2 -15
@@ -1030,9 +1030,8 @@ static inline unsigned int get_pcd(struct pxafb_info *fbi,/* * Some touchscreens need hsync information from the video driver to -* function correctly. We export it here. Note that 'hsync_time' and -* the value returned from pxafb_get_hsync_time() is the *reciprocal* -* of the hsync period in seconds. +* function correctly. We export it here. Note that 'hsync_time' is +* the *reciprocal* of the hsync period in seconds. */ static inline void set_hsync_time (struct pxafb_info *fbi,unsigned int pcd) {
@@ -1048,18 +1047,6 @@ static inline void set_hsync_time(struct pxafb_info *fbi, unsigned int pcd) fbi->hsync_time = htime; } -unsigned long pxafb_get_hsync_time (struct device *dev) -{ -struct pxafb_info *fbi =dev_get_drvdata (dev); - -/* If display is blanked/suspended, hsync isn't active */ -if (!fbi || (fbi->state !=C_ENABLE )) -return 0 ; - -return fbi->hsync_time; -} -EXPORT_SYMBOL (pxafb_get_hsync_time); -static int setup_frame_dma (struct pxafb_info *fbi,int dma,int pal,unsigned long start,size_t size) {
include/linux/platform_data/video-pxafb.h +0 -1
@@ -150,7 +150,6 @@ struct pxafb_mach_info { };void pxa_set_fb_info (struct device *,struct pxafb_mach_info *); -unsigned long pxafb_get_hsync_time (struct device *dev);/* smartpanel related */ #define SMART_CMD_A0 (0x1 << 8)
Signature · 1 line
2.49.0
Re: [PATCH v2 11/14] fbdev/pxafb: Unexport symbol
Quoted 7 lines · Thomas Zimmermann
Fix the compile-time warning
drivers/video/fbdev/pxafb.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingThe affected symbol is not used anywhere, so remove the function entirely.
Quoted 8 lines
v2:
- remove unused functions (Helge)Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/video/fbdev/pxafb.c | 17 ++--------------- include/linux/platform_data/video-pxafb.h | 1 - 2 files changed, 2 insertions(+), 16 deletions(-)
Thomas Zimmermann
maintainerPATCH v2 12/14 fbdev/sisfb: Unexport symbols
In reply to Thomas ZimmermannFix the compile-time warning
drivers/video/fbdev/sis/sis_main.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing
The affected symbols are not used outside of their module. Some of the symbols are not used anywhere, so remove the functions entirely. Also remove the related, but unused, define SISFB_HAVE_MALLOC_NEW.
v2:
- remove unused functions (Helge)
--- drivers/video/fbdev/sis/sis.h | 2 -- drivers/video/fbdev/sis/sis_main.c | 25 ------------------------- include/video/sisfb.h | 6 ------ 3 files changed, 33 deletions(-)
drivers/video/fbdev/sis/sis.h +0 -2
@@ -673,9 +673,7 @@ unsigned int sisfb_read_mio_pci_word(struct SiS_Private *SiS_Pr, int reg);/* SiS-specific exported functions */ void sis_malloc (struct sis_memreq *req); -void sis_malloc_new (struct pci_dev *pdev,struct sis_memreq *req);void sis_free (u32 base); -void sis_free_new (struct pci_dev *pdev,u32 base);/* Routines from init.c/init301.c */ extern unsigned short SiS_GetModeID_LCD(int VGAEngine, unsigned int VBFlags, int HDisplay,
drivers/video/fbdev/sis/sis_main.c +0 -25
@@ -3421,14 +3421,6 @@ sis_malloc(struct sis_memreq *req) req->offset = req->size =0 ; } -void -sis_malloc_new (struct pci_dev *pdev,struct sis_memreq *req) -{ -struct sis_video_info *ivideo =pci_get_drvdata (pdev); - -sis_int_malloc (ivideo, req); -} -/* sis_free: u32 because "base" is offset inside video ram, can never be >4GB */ static void
@@ -3455,14 +3447,6 @@ sis_free(u32 base)sis_int_free (ivideo, base); } -void -sis_free_new (struct pci_dev *pdev,u32 base) -{ -struct sis_video_info *ivideo =pci_get_drvdata (pdev); - -sis_int_free (ivideo, base); -} -/* --------------------- SetMode routines ------------------------- */ static void
@@ -6832,12 +6816,3 @@ MODULE_PARM_DESC(videoram,#endif #endif /* /MODULE */ - -/* _GPL only for new symbols. */ -EXPORT_SYMBOL (sis_malloc); -EXPORT_SYMBOL (sis_free); -EXPORT_SYMBOL_GPL (sis_malloc_new); -EXPORT_SYMBOL_GPL (sis_free_new); - - -
include/video/sisfb.h +0 -6
@@ -15,10 +15,4 @@#define SIS_300_VGA 1#define SIS_315_VGA 2 -#define SISFB_HAVE_MALLOC_NEW -extern void sis_malloc (struct sis_memreq *req); -extern void sis_malloc_new (struct pci_dev *pdev,struct sis_memreq *req); - -extern void sis_free (u32 base); -extern void sis_free_new (struct pci_dev *pdev,u32 base);#endif
Signature · 1 line
2.49.0
Re: [PATCH v2 12/14] fbdev/sisfb: Unexport symbols
Quoted 11 lines · Thomas Zimmermann
Fix the compile-time warning
drivers/video/fbdev/sis/sis_main.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingThe affected symbols are not used outside of their module. Some of the symbols are not used anywhere, so remove the functions entirely. Also remove the related, but unused, define
SISFB_HAVE_MALLOC_NEW.v2:
- remove unused functions (Helge)
Quoted 6 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/video/fbdev/sis/sis.h | 2 -- drivers/video/fbdev/sis/sis_main.c | 25 ------------------------- include/video/sisfb.h | 6 ------ 3 files changed, 33 deletions(-)
Thomas Zimmermann
maintainerPATCH v2 13/14 fbdev/viafb: Include <linux/export.h>
In reply to Thomas ZimmermannFix the compile-time warnings
drivers/video/fbdev/via/via-core.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing drivers/video/fbdev/via/via_i2c.c: warning: EXPORT_SYMBOL() is used, but #include <linux/export.h> is missing
--- drivers/video/fbdev/via/via-core.c | 1 + drivers/video/fbdev/via/via_i2c.c | 1 + 2 files changed, 2 insertions(+)
drivers/video/fbdev/via/via-core.c +1 -0
@@ -9,6 +9,7 @@* Core code for the Via multifunction framebuffer device. */ #include <linux/aperture.h> +#include <linux/export.h> #include <linux/via-core.h> #include <linux/via_i2c.h> #include "via-gpio.h"
drivers/video/fbdev/via/via_i2c.c +1 -0
@@ -7,6 +7,7 @@#include <linux/platform_device.h> #include <linux/delay.h> +#include <linux/export.h> #include <linux/spinlock.h> #include <linux/module.h> #include <linux/via-core.h>
Signature · 1 line
2.49.0
Re: [PATCH v2 13/14] fbdev/viafb: Include <linux/export.h>
Quoted 10 lines · Thomas Zimmermann
Fix the compile-time warnings
drivers/video/fbdev/via/via-core.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingdrivers/video/fbdev/via/via_i2c.c: warning:EXPORT_SYMBOL()is used, but #include <linux/export.h> is missingSigned-off-by Thomas Zimmermann <[email protected]>--- drivers/video/fbdev/via/via-core.c | 1 + drivers/video/fbdev/via/via_i2c.c | 1 + 2 files changed, 2 insertions(+)
Thomas Zimmermann
maintainerPATCH v2 14/14 fbdev/viafb: Do not include <linux/export.h>
In reply to Thomas ZimmermannFix the compile-time warning
drivers/video/fbdev/via/via-gpio.c: warning: EXPORT_SYMBOL() is not used, but #include <linux/export.h> is present
--- drivers/video/fbdev/via/via-gpio.c | 1 - 1 file changed, 1 deletion(-)
drivers/video/fbdev/via/via-gpio.c +0 -1
@@ -10,7 +10,6 @@#include <linux/gpio/machine.h> #include <linux/platform_device.h> #include <linux/via-core.h> -#include <linux/export.h> #include "via-gpio.h" /*
Signature · 1 line
2.49.0
Re: [PATCH v2 14/14] fbdev/viafb: Do not include <linux/export.h>
Quoted 8 lines · Thomas Zimmermann
Fix the compile-time warning
drivers/video/fbdev/via/via-gpio.c: warning:EXPORT_SYMBOL()is not used, but #include <linux/export.h> is presentSigned-off-by Thomas Zimmermann <[email protected]>--- drivers/video/fbdev/via/via-gpio.c | 1 - 1 file changed, 1 deletion(-)