github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 07:33:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: dvb-usb: Constify struct usb_device_id

Browse Source 
'struct usb_device_id' is not modified in these drivers.

Constifying this structure moves some data to a read-only section, so
increase overall security.

In order to do that, struct dvb_usb_device_description (in dvb-usb.h) also
needs to be updated.

On a x86_64, with allmodconfig, as an example:
Before:
======
   text	   data	    bss	    dec	    hex	filename
   1983	   4240	      4	   6227	   1853	drivers/media/usb/dvb-usb/a800.o

After:
=====
   text	   data	    bss	    dec	    hex	filename
   2079	   4144	      4	   6227	   1853	drivers/media/usb/dvb-usb/a800.o

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
Christophe JAILLET 2025-01-05 22:19:57 +01:00 committed by Hans Verkuil
parent 19442ed183
commit 51f76375e3
22 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/usb/dvb-usb/a800.c
View File

@ -77,7 +77,7 @@ enum {
AVERMEDIA_DVBT_USB2_WARM,
};
static struct usb_device_id a800_table[] = {
static const struct usb_device_id a800_table[] = {
DVB_USB_DEV(AVERMEDIA, AVERMEDIA_DVBT_USB2_COLD),
DVB_USB_DEV(AVERMEDIA, AVERMEDIA_DVBT_USB2_WARM),
{ }

2
drivers/media/usb/dvb-usb/af9005.c
View File

@ -1005,7 +1005,7 @@ enum {
ANSONIC_DVBT_USB,
};
static struct usb_device_id af9005_usb_table[] = {
static const struct usb_device_id af9005_usb_table[] = {
DVB_USB_DEV(AFATECH, AFATECH_AF9005),
DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_T_USB_XE),
DVB_USB_DEV(ANSONIC, ANSONIC_DVBT_USB),

2
drivers/media/usb/dvb-usb/az6027.c
View File

@ -1107,7 +1107,7 @@ enum {
ELGATO_EYETV_SAT_V3,
};
static struct usb_device_id az6027_usb_table[] = {
static const struct usb_device_id az6027_usb_table[] = {
DVB_USB_DEV(AZUREWAVE, AZUREWAVE_AZ6027),
DVB_USB_DEV(TERRATEC, TERRATEC_DVBS2CI_V1),
DVB_USB_DEV(TERRATEC, TERRATEC_DVBS2CI_V2),

2
drivers/media/usb/dvb-usb/cinergyT2-core.c
View File

@ -197,7 +197,7 @@ enum {
TERRATEC_CINERGY_T2,
};
static struct usb_device_id cinergyt2_usb_table[] = {
static const struct usb_device_id cinergyt2_usb_table[] = {
DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_T2),
{ }
};

4
drivers/media/usb/dvb-usb/cxusb.c
View File

@ -78,7 +78,7 @@ enum cxusb_table_index {
NR__cxusb_table_index
};
static struct usb_device_id cxusb_table[];
static const struct usb_device_id cxusb_table[];
int cxusb_ctrl_msg(struct dvb_usb_device *d,
u8 cmd, const u8 *wbuf, int wlen, u8 *rbuf, int rlen)
@ -1692,7 +1692,7 @@ static void cxusb_disconnect(struct usb_interface *intf)
dvb_usb_device_exit(intf);
}
static struct usb_device_id cxusb_table[] = {
static const struct usb_device_id cxusb_table[] = {
DVB_USB_DEV(MEDION, MEDION_MD95700),
DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_LG064F_COLD),
DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_LG064F_WARM),

2
drivers/media/usb/dvb-usb/dibusb-mb.c
View File

@ -155,7 +155,7 @@ enum {
ULTIMA_TVBOX_ANCHOR_COLD,
};
static struct usb_device_id dibusb_dib3000mb_table[] = {
static const struct usb_device_id dibusb_dib3000mb_table[] = {
DVB_USB_DEV(WIDEVIEW, WIDEVIEW_DVBT_USB_COLD),
DVB_USB_DEV(WIDEVIEW, WIDEVIEW_DVBT_USB_WARM),
DVB_USB_DEV(COMPRO, COMPRO_DVBU2000_COLD),

2
drivers/media/usb/dvb-usb/dibusb-mc.c
View File

@ -43,7 +43,7 @@ enum {
HUMAX_DVB_T_STICK_HIGH_SPEED_WARM,
};
static struct usb_device_id dibusb_dib3000mc_table[] = {
static const struct usb_device_id dibusb_dib3000mc_table[] = {
DVB_USB_DEV(DIBCOM, DIBCOM_MOD3001_COLD),
DVB_USB_DEV(DIBCOM, DIBCOM_MOD3001_WARM),
DVB_USB_DEV(ULTIMA_ELECTRONIC, ULTIMA_TVBOX_USB2_COLD),

2
drivers/media/usb/dvb-usb/digitv.c
View File

@ -299,7 +299,7 @@ enum {
ANCHOR_NEBULA_DIGITV,
};
static struct usb_device_id digitv_table[] = {
static const struct usb_device_id digitv_table[] = {
DVB_USB_DEV(ANCHOR, ANCHOR_NEBULA_DIGITV),
{ }
};

2
drivers/media/usb/dvb-usb/dtt200u.c
View File

@ -171,7 +171,7 @@ enum {
MIGLIA_WT220U_ZAP250_COLD,
};
static struct usb_device_id dtt200u_usb_table[] = {
static const struct usb_device_id dtt200u_usb_table[] = {
DVB_USB_DEV(WIDEVIEW, WIDEVIEW_DTT200U_COLD),
DVB_USB_DEV(WIDEVIEW, WIDEVIEW_DTT200U_WARM),
DVB_USB_DEV(WIDEVIEW, WIDEVIEW_WT220U_COLD),

2
drivers/media/usb/dvb-usb/dtv5100.c
View File

@ -166,7 +166,7 @@ enum {
AME_DTV5100,
};
static struct usb_device_id dtv5100_table[] = {
static const struct usb_device_id dtv5100_table[] = {
DVB_USB_DEV(AME, AME_DTV5100),
{ }
};

4
drivers/media/usb/dvb-usb/dvb-usb.h
View File

@ -73,8 +73,8 @@ struct dvb_usb_device_description {
const char *name;
#define DVB_USB_ID_MAX_NUM 15
struct usb_device_id *cold_ids[DVB_USB_ID_MAX_NUM];
struct usb_device_id *warm_ids[DVB_USB_ID_MAX_NUM];
const struct usb_device_id *cold_ids[DVB_USB_ID_MAX_NUM];
const struct usb_device_id *warm_ids[DVB_USB_ID_MAX_NUM];
};
static inline u8 rc5_custom(struct rc_map_table *key)

2
drivers/media/usb/dvb-usb/dw2102.c
View File

@ -1836,7 +1836,7 @@ enum dw2102_table_entry {
TEVII_S662
};
static struct usb_device_id dw2102_table[] = {
static const struct usb_device_id dw2102_table[] = {
DVB_USB_DEV(CYPRESS, CYPRESS_DW2102),
DVB_USB_DEV(CYPRESS, CYPRESS_DW2101),
DVB_USB_DEV(CYPRESS, CYPRESS_DW2104),

2
drivers/media/usb/dvb-usb/gp8psk.c
View File

@ -319,7 +319,7 @@ enum {
GENPIX_SKYWALKER_CW3K,
};
static struct usb_device_id gp8psk_usb_table[] = {
static const struct usb_device_id gp8psk_usb_table[] = {
DVB_USB_DEV(GENPIX, GENPIX_8PSK_REV_1_COLD),
DVB_USB_DEV(GENPIX, GENPIX_8PSK_REV_1_WARM),
DVB_USB_DEV(GENPIX, GENPIX_8PSK_REV_2),

2
drivers/media/usb/dvb-usb/m920x.c
View File

@ -909,7 +909,7 @@ enum {
AZUREWAVE_TWINHAN_VP7049,
};
static struct usb_device_id m920x_table[] = {
static const struct usb_device_id m920x_table[] = {
DVB_USB_DEV(MSI, MSI_MEGASKY580),
DVB_USB_DEV(ANUBIS_ELECTRONIC, ANUBIS_MSI_DIGI_VOX_MINI_II),
DVB_USB_DEV(ANUBIS_ELECTRONIC, ANUBIS_LIFEVIEW_TV_WALKER_TWIN_COLD),

2
drivers/media/usb/dvb-usb/nova-t-usb2.c
View File

@ -165,7 +165,7 @@ enum {
HAUPPAUGE_WINTV_NOVA_T_USB2_WARM,
};
static struct usb_device_id nova_t_table[] = {
static const struct usb_device_id nova_t_table[] = {
DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_WINTV_NOVA_T_USB2_COLD),
DVB_USB_DEV(HAUPPAUGE, HAUPPAUGE_WINTV_NOVA_T_USB2_WARM),
{ }

2
drivers/media/usb/dvb-usb/opera1.c
View File

@ -425,7 +425,7 @@ enum {
OPERA1_WARM,
};
static struct usb_device_id opera1_table[] = {
static const struct usb_device_id opera1_table[] = {
DVB_USB_DEV(CYPRESS, CYPRESS_OPERA1_COLD),
DVB_USB_DEV(OPERA1, OPERA1_WARM),
{ }

4
drivers/media/usb/dvb-usb/pctv452e.c
View File

@ -913,7 +913,7 @@ static struct i2c_algorithm pctv452e_i2c_algo = {
static int pctv452e_frontend_attach(struct dvb_usb_adapter *a)
{
struct usb_device_id *id;
const struct usb_device_id *id;
a->fe_adap[0].fe = dvb_attach(stb0899_attach, &stb0899_config,
&a->dev->i2c_adap);
@ -959,7 +959,7 @@ enum {
TECHNOTREND_CONNECT_S2_3650_CI,
};
static struct usb_device_id pctv452e_usb_table[] = {
static const struct usb_device_id pctv452e_usb_table[] = {
DVB_USB_DEV(PINNACLE, PINNACLE_PCTV_452E),
DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2_3600),
DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2_3650_CI),

2
drivers/media/usb/dvb-usb/technisat-usb2.c
View File

@ -693,7 +693,7 @@ enum {
TECHNISAT_USB2_DVB_S2,
};
static struct usb_device_id technisat_usb2_id_table[] = {
static const struct usb_device_id technisat_usb2_id_table[] = {
DVB_USB_DEV(TECHNISAT, TECHNISAT_USB2_DVB_S2),
{ }
};

2
drivers/media/usb/dvb-usb/ttusb2.c
View File

@ -638,7 +638,7 @@ enum {
TECHNOTREND_CONNECT_S2400_8KEEPROM,
};
static struct usb_device_id ttusb2_table[] = {
static const struct usb_device_id ttusb2_table[] = {
DVB_USB_DEV(PINNACLE, PINNACLE_PCTV_400E),
DVB_USB_DEV(PINNACLE, PINNACLE_PCTV_450E),
DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2400),

2
drivers/media/usb/dvb-usb/umt-010.c
View File

@ -86,7 +86,7 @@ enum {
HANFTEK_UMT_010_WARM,
};
static struct usb_device_id umt_table[] = {
static const struct usb_device_id umt_table[] = {
DVB_USB_DEV(HANFTEK, HANFTEK_UMT_010_COLD),
DVB_USB_DEV(HANFTEK, HANFTEK_UMT_010_WARM),
{ }

2
drivers/media/usb/dvb-usb/vp702x.c
View File

@ -375,7 +375,7 @@ enum {
VISIONPLUS_VP7020_WARM,
};
static struct usb_device_id vp702x_usb_table[] = {
static const struct usb_device_id vp702x_usb_table[] = {
DVB_USB_DEV(VISIONPLUS, VISIONPLUS_VP7021_COLD),
// DVB_USB_DEV(VISIONPLUS, VISIONPLUS_VP7020_COLD),
// DVB_USB_DEV(VISIONPLUS, VISIONPLUS_VP7020_WARM),

2
drivers/media/usb/dvb-usb/vp7045.c
View File

@ -179,7 +179,7 @@ enum {
VISIONPLUS_TINYUSB2_WARM,
};
static struct usb_device_id vp7045_usb_table[] = {
static const struct usb_device_id vp7045_usb_table[] = {
DVB_USB_DEV(VISIONPLUS, VISIONPLUS_VP7045_COLD),
DVB_USB_DEV(VISIONPLUS, VISIONPLUS_VP7045_WARM),
DVB_USB_DEV(VISIONPLUS, VISIONPLUS_TINYUSB2_COLD),