@@ -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,
@@ -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);
-
-
-
@@ -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
Fix 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) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- 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(-)