iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] drivers/isdn/gigaset: mark some static data as const (v2)

Browse Source 
Mark some static arrays as const that aren't and shouldn't be modified, and
remove incorrect static attribute from some variables.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Hansjoerg Lipp <hjlipp@web.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tilman Schmidt 2007-03-29 01:20:34 -07:00 committed by Linus Torvalds
parent 75e8defbe4
commit 35dc845782
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/isdn/gigaset/bas-gigaset.c
View File

@ -54,7 +54,7 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode");
#define USB_SX353_PRODUCT_ID 0x0022 #define USB_SX353_PRODUCT_ID 0x0022
/* table of devices that work with this driver */ /* table of devices that work with this driver */
static struct usb_device_id gigaset_table [] = { static const struct usb_device_id gigaset_table [] = {
{ USB_DEVICE(USB_GIGA_VENDOR_ID, USB_3070_PRODUCT_ID) }, { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_3070_PRODUCT_ID) },
{ USB_DEVICE(USB_GIGA_VENDOR_ID, USB_3075_PRODUCT_ID) }, { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_3075_PRODUCT_ID) },
{ USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX303_PRODUCT_ID) }, { USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX303_PRODUCT_ID) },
@ -2305,7 +2305,7 @@ static void gigaset_disconnect(struct usb_interface *interface)
gigaset_unassign(cs); gigaset_unassign(cs);
} }
static struct gigaset_ops gigops = { static const struct gigaset_ops gigops = {
gigaset_write_cmd, gigaset_write_cmd,
gigaset_write_room, gigaset_write_room,
gigaset_chars_in_buffer, gigaset_chars_in_buffer,

6
drivers/isdn/gigaset/common.c
View File

@ -944,8 +944,8 @@ static DEFINE_SPINLOCK(driver_lock);
struct cardstate *gigaset_get_cs_by_id(int id) struct cardstate *gigaset_get_cs_by_id(int id)
{ {
unsigned long flags; unsigned long flags;
static struct cardstate *ret = NULL; struct cardstate *ret = NULL;
static struct cardstate *cs; struct cardstate *cs;
struct gigaset_driver *drv; struct gigaset_driver *drv;
unsigned i; unsigned i;
@ -999,7 +999,7 @@ void gigaset_debugdrivers(void)
static struct cardstate *gigaset_get_cs_by_minor(unsigned minor) static struct cardstate *gigaset_get_cs_by_minor(unsigned minor)
{ {
unsigned long flags; unsigned long flags;
static struct cardstate *ret = NULL; struct cardstate *ret = NULL;
struct gigaset_driver *drv; struct gigaset_driver *drv;
unsigned index; unsigned index;

4
drivers/isdn/gigaset/ev-layer.c
View File

@ -409,7 +409,7 @@ static struct reply_t tab_cid[] = /* no dle mode */ //FIXME
}; };
#endif #endif
static struct resp_type_t resp_type[]= static const struct resp_type_t resp_type[] =
{ {
/*{"", RSP_EMPTY, RT_NOTHING},*/ /*{"", RSP_EMPTY, RT_NOTHING},*/
{"OK", RSP_OK, RT_NOTHING}, {"OK", RSP_OK, RT_NOTHING},
@ -511,7 +511,7 @@ void gigaset_handle_modem_response(struct cardstate *cs)
unsigned char *argv[MAX_REC_PARAMS + 1]; unsigned char *argv[MAX_REC_PARAMS + 1];
int params; int params;
int i, j; int i, j;
struct resp_type_t *rt; const struct resp_type_t *rt;
int curarg; int curarg;
unsigned long flags; unsigned long flags;
unsigned next, tail, head; unsigned next, tail, head;

4
drivers/isdn/gigaset/isocdata.c
View File

@ -274,7 +274,7 @@ static inline void dump_bytes(enum debuglevel level, const char *tag,
* bit 12..10 = number of trailing '1' bits in result * bit 12..10 = number of trailing '1' bits in result
* bit 14..13 = number of bits added by stuffing * bit 14..13 = number of bits added by stuffing
*/ */
static u16 stufftab[5 * 256] = { static const u16 stufftab[5 * 256] = {
// previous 1s = 0: // previous 1s = 0:
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x201f, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x201f,
@ -629,7 +629,7 @@ static inline void hdlc_frag(struct bc_state *bcs, unsigned inbits)
* (replacing 8 by 7 to make it fit; the algorithm won't care) * (replacing 8 by 7 to make it fit; the algorithm won't care)
* bit 7 set if there are 5 or more "interior" consecutive '1' bits * bit 7 set if there are 5 or more "interior" consecutive '1' bits
*/ */
static unsigned char bitcounts[256] = { static const unsigned char bitcounts[256] = {
0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04,
0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05,
0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04,

2
drivers/isdn/gigaset/ser-gigaset.c
View File

@ -459,7 +459,7 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
return -EINVAL; return -EINVAL;
} }
static struct gigaset_ops ops = { static const struct gigaset_ops ops = {
gigaset_write_cmd, gigaset_write_cmd,
gigaset_write_room, gigaset_write_room,
gigaset_chars_in_buffer, gigaset_chars_in_buffer,

4
drivers/isdn/gigaset/usb-gigaset.c
View File

@ -50,7 +50,7 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode");
#define USB_M105_PRODUCT_ID 0x0009 #define USB_M105_PRODUCT_ID 0x0009
/* table of devices that work with this driver */ /* table of devices that work with this driver */
static struct usb_device_id gigaset_table [] = { static const struct usb_device_id gigaset_table [] = {
{ USB_DEVICE(USB_M105_VENDOR_ID, USB_M105_PRODUCT_ID) }, { USB_DEVICE(USB_M105_VENDOR_ID, USB_M105_PRODUCT_ID) },
{ } /* Terminating entry */ { } /* Terminating entry */
}; };
@ -860,7 +860,7 @@ static void gigaset_disconnect(struct usb_interface *interface)
gigaset_unassign(cs); gigaset_unassign(cs);
} }
static struct gigaset_ops ops = { static const struct gigaset_ops ops = {
gigaset_write_cmd, gigaset_write_cmd,
gigaset_write_room, gigaset_write_room,
gigaset_chars_in_buffer, gigaset_chars_in_buffer,