Skip to content

Commit df47e53

Browse files
AdrianBunkgregkh
AdrianBunk
authored and
gregkh
committed
[PATCH] USB: sisusbvga: possible cleanups
This patch contains the following possible cleanups: - make needlessly global functions static - function and struct declarations belong into header files - make SiS_VCLKData const - #if 0 the following unused global functions: - sisusb.c: sisusb_writew() - sisusb.c: sisusb_readw() - sisusb_init.c: SiSUSB_GetModeID() Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2682d27 commit df47e53

File tree

5 files changed

+28
-72
lines changed

5 files changed

+28
-72
lines changed

‎drivers/usb/misc/sisusbvga/sisusb.c

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
#include <linux/vmalloc.h>
5454

5555
#include "sisusb.h"
56+
#include "sisusb_init.h"
5657

5758
#ifdef INCL_SISUSB_CON
5859
#include <linux/font.h>
@@ -63,36 +64,6 @@
6364
/* Forward declarations / clean-up routines */
6465

6566
#ifdef INCL_SISUSB_CON
66-
int sisusb_setreg(struct sisusb_usb_data *sisusb, int port, u8 data);
67-
int sisusb_getreg(struct sisusb_usb_data *sisusb, int port, u8 *data);
68-
int sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data);
69-
int sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data);
70-
int sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand, u8 myor);
71-
int sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port, u8 index, u8 myor);
72-
int sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand);
73-
74-
int sisusb_writeb(struct sisusb_usb_data *sisusb, u32 adr, u8 data);
75-
int sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data);
76-
int sisusb_writew(struct sisusb_usb_data *sisusb, u32 adr, u16 data);
77-
int sisusb_readw(struct sisusb_usb_data *sisusb, u32 adr, u16 *data);
78-
int sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,
79-
u32 dest, int length, size_t *bytes_written);
80-
81-
int sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init);
82-
83-
extern int SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
84-
extern int SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo);
85-
86-
extern void sisusb_init_concode(void);
87-
extern int sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last);
88-
extern void sisusb_console_exit(struct sisusb_usb_data *sisusb);
89-
90-
extern void sisusb_set_cursor(struct sisusb_usb_data *sisusb, unsigned int location);
91-
92-
extern int sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,
93-
u8 *arg, int cmapsz, int ch512, int dorecalc,
94-
struct vc_data *c, int fh, int uplock);
95-
9667
static int sisusb_first_vc = 0;
9768
static int sisusb_last_vc = 0;
9869
module_param_named(first, sisusb_first_vc, int, 0);
@@ -1360,9 +1331,6 @@ sisusb_getreg(struct sisusb_usb_data *sisusb, int port, u8 *data)
13601331
}
13611332
#endif
13621333

1363-
#ifndef INCL_SISUSB_CON
1364-
static
1365-
#endif
13661334
int
13671335
sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data)
13681336
{
@@ -1372,9 +1340,6 @@ sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data)
13721340
return ret;
13731341
}
13741342

1375-
#ifndef INCL_SISUSB_CON
1376-
static
1377-
#endif
13781343
int
13791344
sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data)
13801345
{
@@ -1384,9 +1349,6 @@ sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data)
13841349
return ret;
13851350
}
13861351

1387-
#ifndef INCL_SISUSB_CON
1388-
static
1389-
#endif
13901352
int
13911353
sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx,
13921354
u8 myand, u8 myor)
@@ -1416,18 +1378,12 @@ sisusb_setidxregmask(struct sisusb_usb_data *sisusb, int port, u8 idx,
14161378
return ret;
14171379
}
14181380

1419-
#ifndef INCL_SISUSB_CON
1420-
static
1421-
#endif
14221381
int
14231382
sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port, u8 index, u8 myor)
14241383
{
14251384
return(sisusb_setidxregandor(sisusb, port, index, 0xff, myor));
14261385
}
14271386

1428-
#ifndef INCL_SISUSB_CON
1429-
static
1430-
#endif
14311387
int
14321388
sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand)
14331389
{
@@ -1449,6 +1405,8 @@ sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data)
14491405
return(sisusb_read_memio_byte(sisusb, SISUSB_TYPE_MEM, adr, data));
14501406
}
14511407

1408+
#if 0
1409+
14521410
int
14531411
sisusb_writew(struct sisusb_usb_data *sisusb, u32 adr, u16 data)
14541412
{
@@ -1461,6 +1419,8 @@ sisusb_readw(struct sisusb_usb_data *sisusb, u32 adr, u16 *data)
14611419
return(sisusb_read_memio_word(sisusb, SISUSB_TYPE_MEM, adr, data));
14621420
}
14631421

1422+
#endif /* 0 */
1423+
14641424
int
14651425
sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,
14661426
u32 dest, int length, size_t *bytes_written)

‎drivers/usb/misc/sisusbvga/sisusb_con.c

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,27 +70,9 @@
7070
#include <linux/vmalloc.h>
7171

7272
#include "sisusb.h"
73+
#include "sisusb_init.h"
7374

7475
#ifdef INCL_SISUSB_CON
75-
extern int sisusb_setreg(struct sisusb_usb_data *, int, u8);
76-
extern int sisusb_getreg(struct sisusb_usb_data *, int, u8 *);
77-
extern int sisusb_setidxreg(struct sisusb_usb_data *, int, u8, u8);
78-
extern int sisusb_getidxreg(struct sisusb_usb_data *, int, u8, u8 *);
79-
extern int sisusb_setidxregor(struct sisusb_usb_data *, int, u8, u8);
80-
extern int sisusb_setidxregand(struct sisusb_usb_data *, int, u8, u8);
81-
extern int sisusb_setidxregandor(struct sisusb_usb_data *, int, u8, u8, u8);
82-
83-
extern int sisusb_writeb(struct sisusb_usb_data *sisusb, u32 adr, u8 data);
84-
extern int sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data);
85-
extern int sisusb_writew(struct sisusb_usb_data *sisusb, u32 adr, u16 data);
86-
extern int sisusb_readw(struct sisusb_usb_data *sisusb, u32 adr, u16 *data);
87-
extern int sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,
88-
u32 dest, int length, size_t *bytes_written);
89-
90-
extern void sisusb_delete(struct kref *kref);
91-
extern int sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init);
92-
93-
extern int SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
9476

9577
#define sisusbcon_writew(val, addr) (*(addr) = (val))
9678
#define sisusbcon_readw(addr) (*(addr))
@@ -103,8 +85,6 @@ static struct sisusb_usb_data *mysisusbs[MAX_NR_CONSOLES];
10385
/* Forward declaration */
10486
static const struct consw sisusb_con;
10587

106-
extern struct mutex disconnect_mutex;
107-
10888
static inline void
10989
sisusbcon_memsetw(u16 *s, u16 c, unsigned int count)
11090
{
@@ -1487,7 +1467,7 @@ static int sisusbdummycon_dummy(void)
14871467

14881468
#define SISUSBCONDUMMY (void *)sisusbdummycon_dummy
14891469

1490-
const struct consw sisusb_dummy_con = {
1470+
static const struct consw sisusb_dummy_con = {
14911471
.owner = THIS_MODULE,
14921472
.con_startup = sisusbdummycon_startup,
14931473
.con_init = sisusbdummycon_init,

‎drivers/usb/misc/sisusbvga/sisusb_init.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ SiSUSB_InitPtr(struct SiS_Private *SiS_Pr)
7474
/* HELPER: Get ModeID */
7575
/*********************************************/
7676

77+
#if 0
7778
unsigned short
7879
SiSUSB_GetModeID(int HDisplay, int VDisplay, int Depth)
7980
{
@@ -157,6 +158,7 @@ SiSUSB_GetModeID(int HDisplay, int VDisplay, int Depth)
157158

158159
return ModeIndex;
159160
}
161+
#endif /* 0 */
160162

161163
/*********************************************/
162164
/* HELPER: SetReg, GetReg */
@@ -233,7 +235,7 @@ SiS_DisplayOn(struct SiS_Private *SiS_Pr)
233235
/* HELPER: Init Port Addresses */
234236
/*********************************************/
235237

236-
void
238+
static void
237239
SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr)
238240
{
239241
SiS_Pr->SiS_P3c4 = BaseAddr + 0x14;

‎drivers/usb/misc/sisusbvga/sisusb_init.h

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ static const struct SiS_CRT1Table SiSUSB_CRT1Table[] =
690690
0x41}} /* 0x54 */
691691
};
692692

693-
static struct SiS_VCLKData SiSUSB_VCLKData[] =
693+
static const struct SiS_VCLKData SiSUSB_VCLKData[] =
694694
{
695695
{ 0x1b,0xe1, 25}, /* 0x00 */
696696
{ 0x4e,0xe4, 28}, /* 0x01 */
@@ -808,8 +808,8 @@ static struct SiS_VCLKData SiSUSB_VCLKData[] =
808808
{ 0x2b,0xc2, 35} /* 0x71 768@576@60 */
809809
};
810810

811-
void SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr);
812-
unsigned short SiSUSB_GetModeID(int HDisplay, int VDisplay, int Depth);
811+
extern struct mutex disconnect_mutex;
812+
813813
int SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
814814
int SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo);
815815

@@ -826,5 +826,19 @@ extern int sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port,
826826
extern int sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port,
827827
u8 idx, u8 myand);
828828

829+
void sisusb_delete(struct kref *kref);
830+
int sisusb_writeb(struct sisusb_usb_data *sisusb, u32 adr, u8 data);
831+
int sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data);
832+
int sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,
833+
u32 dest, int length, size_t *bytes_written);
834+
int sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init);
835+
int sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,
836+
u8 *arg, int cmapsz, int ch512, int dorecalc,
837+
struct vc_data *c, int fh, int uplock);
838+
void sisusb_set_cursor(struct sisusb_usb_data *sisusb, unsigned int location);
839+
int sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last);
840+
void sisusb_console_exit(struct sisusb_usb_data *sisusb);
841+
void sisusb_init_concode(void);
842+
829843
#endif
830844

‎drivers/usb/misc/sisusbvga/sisusb_struct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ struct SiS_Private
161161
const struct SiS_Ext *SiS_EModeIDTable;
162162
const struct SiS_Ext2 *SiS_RefIndex;
163163
const struct SiS_CRT1Table *SiS_CRT1Table;
164-
struct SiS_VCLKData *SiS_VCLKData;
164+
const struct SiS_VCLKData *SiS_VCLKData;
165165
const struct SiS_ModeResInfo *SiS_ModeResInfo;
166166
};
167167

0 commit comments

Comments
 (0)