[media] lmedm04: make some string arrays static
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Wed, 30 Nov 2016 21:39:11 +0000 (19:39 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 3 Feb 2017 09:39:37 +0000 (07:39 -0200)
It takes more .text to initialize these on the stack than they occupy
in .rodata, so just make them static const.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/usb/dvb-usb-v2/lmedm04.c

index 5a327676e23597468f108319afdd7e033cde64f4..66833b61321a20e5017227d9ccd36ce76f6178b9 100644 (file)
@@ -996,8 +996,9 @@ static int lme_name(struct dvb_usb_adapter *adap)
        struct dvb_usb_device *d = adap_to_d(adap);
        struct lme2510_state *st = adap_to_priv(adap);
        const char *desc = d->name;
-       char *fe_name[] = {"", " LG TDQY-P001F", " SHARP:BS2F7HZ7395",
-                               " SHARP:BS2F7HZ0194", " RS2000"};
+       static const char * const fe_name[] = {
+               "", " LG TDQY-P001F", " SHARP:BS2F7HZ7395",
+               " SHARP:BS2F7HZ0194", " RS2000"};
        char *name = adap->fe[0]->ops.info.name;
 
        strlcpy(name, desc, 128);
@@ -1118,7 +1119,7 @@ static int dm04_lme2510_tuner(struct dvb_usb_adapter *adap)
 {
        struct dvb_usb_device *d = adap_to_d(adap);
        struct lme2510_state *st = adap_to_priv(adap);
-       char *tun_msg[] = {"", "TDA8263", "IX2505V", "DVB_PLL_OPERA", "RS2000"};
+       static const char * const tun_msg[] = {"", "TDA8263", "IX2505V", "DVB_PLL_OPERA", "RS2000"};
        int ret = 0;
 
        switch (st->tuner_config) {