aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-08 17:10:05 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-06-15 17:10:01 -0400
commitfe63a1a6216749fd9d9c5b52d52b75240f9d20f3 (patch)
treea027e2e6c0b45470892f860f13a59f6af687f2e9 /drivers/media
parent5fb94e9ca333f0fe1d96de06704a79942b3832c3 (diff)
media: dvb: fix location of get_dvb_firmware script
This script was moved out of Documentation/dvb, but the links weren't updated. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Acked-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb-frontends/Kconfig18
-rw-r--r--drivers/media/dvb-frontends/nxt200x.c4
-rw-r--r--drivers/media/dvb-frontends/or51211.c2
-rw-r--r--drivers/media/dvb-frontends/sp8870.c2
-rw-r--r--drivers/media/dvb-frontends/sp887x.c2
-rw-r--r--drivers/media/dvb-frontends/tda1004x.c4
-rw-r--r--drivers/media/dvb-frontends/tda10071.c2
-rw-r--r--drivers/media/pci/cx18/cx18-dvb.c2
-rw-r--r--drivers/media/pci/cx23885/cx23885-cards.c2
-rw-r--r--drivers/media/pci/ttpci/Kconfig2
-rw-r--r--drivers/media/usb/dvb-usb-v2/dvb_usb_core.c2
-rw-r--r--drivers/media/usb/dvb-usb/dvb-usb-firmware.c2
-rw-r--r--drivers/media/usb/dvb-usb/dw2102.c4
-rw-r--r--drivers/media/usb/dvb-usb/gp8psk.c2
-rw-r--r--drivers/media/usb/dvb-usb/opera1.c2
-rw-r--r--drivers/media/usb/ttusb-dec/Kconfig6
16 files changed, 28 insertions, 30 deletions
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 55e36a4f5215..9ecaa9d0744a 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -324,7 +324,7 @@ config DVB_SP8870
324 A DVB-T tuner module. Say Y when you want to support this frontend. 324 A DVB-T tuner module. Say Y when you want to support this frontend.
325 325
326 This driver needs external firmware. Please use the command 326 This driver needs external firmware. Please use the command
327 "<kerneldir>/Documentation/dvb/get_dvb_firmware sp8870" to 327 "<kerneldir>/scripts/get_dvb_firmware sp8870" to
328 download/extract it, and then copy it to /usr/lib/hotplug/firmware 328 download/extract it, and then copy it to /usr/lib/hotplug/firmware
329 or /lib/firmware (depending on configuration of firmware hotplug). 329 or /lib/firmware (depending on configuration of firmware hotplug).
330 330
@@ -336,7 +336,7 @@ config DVB_SP887X
336 A DVB-T tuner module. Say Y when you want to support this frontend. 336 A DVB-T tuner module. Say Y when you want to support this frontend.
337 337
338 This driver needs external firmware. Please use the command 338 This driver needs external firmware. Please use the command
339 "<kerneldir>/Documentation/dvb/get_dvb_firmware sp887x" to 339 "<kerneldir>/scripts/get_dvb_firmware sp887x" to
340 download/extract it, and then copy it to /usr/lib/hotplug/firmware 340 download/extract it, and then copy it to /usr/lib/hotplug/firmware
341 or /lib/firmware (depending on configuration of firmware hotplug). 341 or /lib/firmware (depending on configuration of firmware hotplug).
342 342
@@ -387,8 +387,8 @@ config DVB_TDA1004X
387 A DVB-T tuner module. Say Y when you want to support this frontend. 387 A DVB-T tuner module. Say Y when you want to support this frontend.
388 388
389 This driver needs external firmware. Please use the commands 389 This driver needs external firmware. Please use the commands
390 "<kerneldir>/Documentation/dvb/get_dvb_firmware tda10045", 390 "<kerneldir>/scripts/get_dvb_firmware tda10045",
391 "<kerneldir>/Documentation/dvb/get_dvb_firmware tda10046" to 391 "<kerneldir>/scripts/get_dvb_firmware tda10046" to
392 download/extract them, and then copy them to /usr/lib/hotplug/firmware 392 download/extract them, and then copy them to /usr/lib/hotplug/firmware
393 or /lib/firmware (depending on configuration of firmware hotplug). 393 or /lib/firmware (depending on configuration of firmware hotplug).
394 394
@@ -591,8 +591,8 @@ config DVB_NXT200X
591 to support this frontend. 591 to support this frontend.
592 592
593 This driver needs external firmware. Please use the commands 593 This driver needs external firmware. Please use the commands
594 "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2002" and 594 "<kerneldir>/scripts/get_dvb_firmware nxt2002" and
595 "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2004" to 595 "<kerneldir>/scripts/get_dvb_firmware nxt2004" to
596 download/extract them, and then copy them to /usr/lib/hotplug/firmware 596 download/extract them, and then copy them to /usr/lib/hotplug/firmware
597 or /lib/firmware (depending on configuration of firmware hotplug). 597 or /lib/firmware (depending on configuration of firmware hotplug).
598 598
@@ -604,7 +604,7 @@ config DVB_OR51211
604 An ATSC 8VSB tuner module. Say Y when you want to support this frontend. 604 An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
605 605
606 This driver needs external firmware. Please use the command 606 This driver needs external firmware. Please use the command
607 "<kerneldir>/Documentation/dvb/get_dvb_firmware or51211" to 607 "<kerneldir>/scripts/get_dvb_firmware or51211" to
608 download it, and then copy it to /usr/lib/hotplug/firmware 608 download it, and then copy it to /usr/lib/hotplug/firmware
609 or /lib/firmware (depending on configuration of firmware hotplug). 609 or /lib/firmware (depending on configuration of firmware hotplug).
610 610
@@ -617,8 +617,8 @@ config DVB_OR51132
617 to support this frontend. 617 to support this frontend.
618 618
619 This driver needs external firmware. Please use the commands 619 This driver needs external firmware. Please use the commands
620 "<kerneldir>/Documentation/dvb/get_dvb_firmware or51132_vsb" and/or 620 "<kerneldir>/scripts/get_dvb_firmware or51132_vsb" and/or
621 "<kerneldir>/Documentation/dvb/get_dvb_firmware or51132_qam" to 621 "<kerneldir>/scripts/get_dvb_firmware or51132_qam" to
622 download firmwares for 8VSB and QAM64/256, respectively. Copy them to 622 download firmwares for 8VSB and QAM64/256, respectively. Copy them to
623 /usr/lib/hotplug/firmware or /lib/firmware (depending on 623 /usr/lib/hotplug/firmware or /lib/firmware (depending on
624 configuration of firmware hotplug). 624 configuration of firmware hotplug).
diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c
index 7aa74403648e..a6cc4952eb74 100644
--- a/drivers/media/dvb-frontends/nxt200x.c
+++ b/drivers/media/dvb-frontends/nxt200x.c
@@ -27,8 +27,8 @@
27 * ATI HDTV Wonder (NXT2004) 27 * ATI HDTV Wonder (NXT2004)
28 * 28 *
29 * This driver needs external firmware. Please use the command 29 * This driver needs external firmware. Please use the command
30 * "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2002" or 30 * "<kerneldir>/scripts/get_dvb_firmware nxt2002" or
31 * "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2004" to 31 * "<kerneldir>/scripts/get_dvb_firmware nxt2004" to
32 * download/extract the appropriate firmware, and then copy it to 32 * download/extract the appropriate firmware, and then copy it to
33 * /usr/lib/hotplug/firmware/ or /lib/firmware/ 33 * /usr/lib/hotplug/firmware/ or /lib/firmware/
34 * (depending on configuration of firmware hotplug). 34 * (depending on configuration of firmware hotplug).
diff --git a/drivers/media/dvb-frontends/or51211.c b/drivers/media/dvb-frontends/or51211.c
index a1b7c301828f..b65ba34fd00a 100644
--- a/drivers/media/dvb-frontends/or51211.c
+++ b/drivers/media/dvb-frontends/or51211.c
@@ -22,7 +22,7 @@
22 22
23/* 23/*
24 * This driver needs external firmware. Please use the command 24 * This driver needs external firmware. Please use the command
25 * "<kerneldir>/Documentation/dvb/get_dvb_firmware or51211" to 25 * "<kerneldir>/scripts/get_dvb_firmware or51211" to
26 * download/extract it, and then copy it to /usr/lib/hotplug/firmware 26 * download/extract it, and then copy it to /usr/lib/hotplug/firmware
27 * or /lib/firmware (depending on configuration of firmware hotplug). 27 * or /lib/firmware (depending on configuration of firmware hotplug).
28 */ 28 */
diff --git a/drivers/media/dvb-frontends/sp8870.c b/drivers/media/dvb-frontends/sp8870.c
index 9a726f3a4896..1d57a20093fc 100644
--- a/drivers/media/dvb-frontends/sp8870.c
+++ b/drivers/media/dvb-frontends/sp8870.c
@@ -21,7 +21,7 @@
21*/ 21*/
22/* 22/*
23 * This driver needs external firmware. Please use the command 23 * This driver needs external firmware. Please use the command
24 * "<kerneldir>/Documentation/dvb/get_dvb_firmware alps_tdlb7" to 24 * "<kerneldir>/scripts/get_dvb_firmware alps_tdlb7" to
25 * download/extract it, and then copy it to /usr/lib/hotplug/firmware 25 * download/extract it, and then copy it to /usr/lib/hotplug/firmware
26 * or /lib/firmware (depending on configuration of firmware hotplug). 26 * or /lib/firmware (depending on configuration of firmware hotplug).
27 */ 27 */
diff --git a/drivers/media/dvb-frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c
index f39d566d7d1d..57a0d0ae2b48 100644
--- a/drivers/media/dvb-frontends/sp887x.c
+++ b/drivers/media/dvb-frontends/sp887x.c
@@ -4,7 +4,7 @@
4 4
5/* 5/*
6 * This driver needs external firmware. Please use the command 6 * This driver needs external firmware. Please use the command
7 * "<kerneldir>/Documentation/dvb/get_dvb_firmware sp887x" to 7 * "<kerneldir>/scripts/get_dvb_firmware sp887x" to
8 * download/extract it, and then copy it to /usr/lib/hotplug/firmware 8 * download/extract it, and then copy it to /usr/lib/hotplug/firmware
9 * or /lib/firmware (depending on configuration of firmware hotplug). 9 * or /lib/firmware (depending on configuration of firmware hotplug).
10 */ 10 */
diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c
index 58e3beff5adc..7dcfb4a4b2d0 100644
--- a/drivers/media/dvb-frontends/tda1004x.c
+++ b/drivers/media/dvb-frontends/tda1004x.c
@@ -21,8 +21,8 @@
21 */ 21 */
22/* 22/*
23 * This driver needs external firmware. Please use the commands 23 * This driver needs external firmware. Please use the commands
24 * "<kerneldir>/Documentation/dvb/get_dvb_firmware tda10045", 24 * "<kerneldir>/scripts/get_dvb_firmware tda10045",
25 * "<kerneldir>/Documentation/dvb/get_dvb_firmware tda10046" to 25 * "<kerneldir>/scripts/get_dvb_firmware tda10046" to
26 * download/extract them, and then copy them to /usr/lib/hotplug/firmware 26 * download/extract them, and then copy them to /usr/lib/hotplug/firmware
27 * or /lib/firmware (depending on configuration of firmware hotplug). 27 * or /lib/firmware (depending on configuration of firmware hotplug).
28 */ 28 */
diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index a59f4fd09df6..1ed67c08e699 100644
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -852,7 +852,7 @@ static int tda10071_init(struct dvb_frontend *fe)
852 ret = request_firmware(&fw, fw_file, &client->dev); 852 ret = request_firmware(&fw, fw_file, &client->dev);
853 if (ret) { 853 if (ret) {
854 dev_err(&client->dev, 854 dev_err(&client->dev,
855 "did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)\n", 855 "did not find the firmware file '%s' (status %d). You can use <kernel_dir>/scripts/get_dvb_firmware to get the firmware\n",
856 fw_file, ret); 856 fw_file, ret);
857 goto error; 857 goto error;
858 } 858 }
diff --git a/drivers/media/pci/cx18/cx18-dvb.c b/drivers/media/pci/cx18/cx18-dvb.c
index 010f39eafce1..a3a7f7065349 100644
--- a/drivers/media/pci/cx18/cx18-dvb.c
+++ b/drivers/media/pci/cx18/cx18-dvb.c
@@ -152,7 +152,7 @@ static int yuan_mpc718_mt352_reqfw(struct cx18_stream *stream,
152 152
153 if (ret) { 153 if (ret) {
154 CX18_ERR("The MPC718 board variant with the MT352 DVB-T demodulator will not work without it\n"); 154 CX18_ERR("The MPC718 board variant with the MT352 DVB-T demodulator will not work without it\n");
155 CX18_ERR("Run 'linux/Documentation/dvb/get_dvb_firmware mpc718' if you need the firmware\n"); 155 CX18_ERR("Run 'linux/scripts/get_dvb_firmware mpc718' if you need the firmware\n");
156 } 156 }
157 return ret; 157 return ret;
158} 158}
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 3a1c55187b2a..9f50748fdf56 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -2426,7 +2426,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
2426 2426
2427 ret = request_firmware(&fw, filename, &dev->pci->dev); 2427 ret = request_firmware(&fw, filename, &dev->pci->dev);
2428 if (ret != 0) 2428 if (ret != 0)
2429 pr_err("did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems.", 2429 pr_err("did not find the firmware file '%s'. You can use <kernel_dir>/scripts/get_dvb_firmware to get the firmware.",
2430 filename); 2430 filename);
2431 else 2431 else
2432 altera_init(&netup_config, fw); 2432 altera_init(&netup_config, fw);
diff --git a/drivers/media/pci/ttpci/Kconfig b/drivers/media/pci/ttpci/Kconfig
index 7b83151ed6c4..dfba74dd6521 100644
--- a/drivers/media/pci/ttpci/Kconfig
+++ b/drivers/media/pci/ttpci/Kconfig
@@ -24,7 +24,7 @@ config DVB_AV7110
24 onboard MPEG2 decoder. 24 onboard MPEG2 decoder.
25 25
26 This driver needs an external firmware. Please use the script 26 This driver needs an external firmware. Please use the script
27 "<kerneldir>/Documentation/dvb/get_dvb_firmware av7110" to 27 "<kerneldir>/scripts/get_dvb_firmware av7110" to
28 download/extract it, and then copy it to /usr/lib/hotplug/firmware 28 download/extract it, and then copy it to /usr/lib/hotplug/firmware
29 or /lib/firmware (depending on configuration of firmware hotplug). 29 or /lib/firmware (depending on configuration of firmware hotplug).
30 30
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index afdcdbf005e9..955318ab7f5e 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -47,7 +47,7 @@ static int dvb_usbv2_download_firmware(struct dvb_usb_device *d,
47 ret = request_firmware(&fw, name, &d->udev->dev); 47 ret = request_firmware(&fw, name, &d->udev->dev);
48 if (ret < 0) { 48 if (ret < 0) {
49 dev_err(&d->udev->dev, 49 dev_err(&d->udev->dev,
50 "%s: Did not find the firmware file '%s'. Please see linux/Documentation/dvb/ for more details on firmware-problems. Status %d\n", 50 "%s: Did not find the firmware file '%s' (status %d). You can use <kernel_dir>/scripts/get_dvb_firmware to get the firmware\n",
51 KBUILD_MODNAME, name, ret); 51 KBUILD_MODNAME, name, ret);
52 goto err; 52 goto err;
53 } 53 }
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
index 15c153e49382..42c207aacbb1 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
@@ -90,7 +90,7 @@ int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_device_pro
90 const struct firmware *fw = NULL; 90 const struct firmware *fw = NULL;
91 91
92 if ((ret = request_firmware(&fw, props->firmware, &udev->dev)) != 0) { 92 if ((ret = request_firmware(&fw, props->firmware, &udev->dev)) != 0) {
93 err("did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)", 93 err("did not find the firmware file '%s' (status %d). You can use <kernel_dir>/scripts/get_dvb_firmware to get the firmware",
94 props->firmware,ret); 94 props->firmware,ret);
95 return ret; 95 return ret;
96 } 96 }
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 346946f35b1a..716711ecce32 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -61,9 +61,7 @@
61#define P1100_FIRMWARE "dvb-usb-p1100.fw" 61#define P1100_FIRMWARE "dvb-usb-p1100.fw"
62#define P7500_FIRMWARE "dvb-usb-p7500.fw" 62#define P7500_FIRMWARE "dvb-usb-p7500.fw"
63 63
64#define err_str "did not find the firmware file. (%s) " \ 64#define err_str "did not find the firmware file '%s'. You can use <kernel_dir>/scripts/get_dvb_firmware to get the firmware"
65 "Please see linux/Documentation/dvb/ for more details " \
66 "on firmware-problems."
67 65
68struct dw2102_state { 66struct dw2102_state {
69 u8 initialized; 67 u8 initialized;
diff --git a/drivers/media/usb/dvb-usb/gp8psk.c b/drivers/media/usb/dvb-usb/gp8psk.c
index 334b9fb98112..1ad8dfb10aa4 100644
--- a/drivers/media/usb/dvb-usb/gp8psk.c
+++ b/drivers/media/usb/dvb-usb/gp8psk.c
@@ -135,7 +135,7 @@ static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d)
135 u8 *buf; 135 u8 *buf;
136 if ((ret = request_firmware(&fw, bcm4500_firmware, 136 if ((ret = request_firmware(&fw, bcm4500_firmware,
137 &d->udev->dev)) != 0) { 137 &d->udev->dev)) != 0) {
138 err("did not find the bcm4500 firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)", 138 err("did not find the bcm4500 firmware file '%s' (status %d). You can use <kernel_dir>/scripts/get_dvb_firmware to get the firmware",
139 bcm4500_firmware,ret); 139 bcm4500_firmware,ret);
140 return ret; 140 return ret;
141 } 141 }
diff --git a/drivers/media/usb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb/opera1.c
index 946a5ccc8f1a..eeafa3cdbbdc 100644
--- a/drivers/media/usb/dvb-usb/opera1.c
+++ b/drivers/media/usb/dvb-usb/opera1.c
@@ -453,7 +453,7 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev,
453 info("start downloading fpga firmware %s",filename); 453 info("start downloading fpga firmware %s",filename);
454 454
455 if ((ret = request_firmware(&fw, filename, &dev->dev)) != 0) { 455 if ((ret = request_firmware(&fw, filename, &dev->dev)) != 0) {
456 err("did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems.", 456 err("did not find the firmware file '%s'. You can use <kernel_dir>/scripts/get_dvb_firmware to get the firmware",
457 filename); 457 filename);
458 return ret; 458 return ret;
459 } else { 459 } else {
diff --git a/drivers/media/usb/ttusb-dec/Kconfig b/drivers/media/usb/ttusb-dec/Kconfig
index 290254ab06db..b205903a3c61 100644
--- a/drivers/media/usb/ttusb-dec/Kconfig
+++ b/drivers/media/usb/ttusb-dec/Kconfig
@@ -12,9 +12,9 @@ config DVB_TTUSB_DEC
12 an external software decoder to watch TV on your computer. 12 an external software decoder to watch TV on your computer.
13 13
14 This driver needs external firmware. Please use the commands 14 This driver needs external firmware. Please use the commands
15 "<kerneldir>/Documentation/dvb/get_dvb_firmware dec2000t", 15 "<kerneldir>/scripts/get_dvb_firmware dec2000t",
16 "<kerneldir>/Documentation/dvb/get_dvb_firmware dec2540t", 16 "<kerneldir>/scripts/get_dvb_firmware dec2540t",
17 "<kerneldir>/Documentation/dvb/get_dvb_firmware dec3000s", 17 "<kerneldir>/scripts/get_dvb_firmware dec3000s",
18 download/extract them, and then copy them to /usr/lib/hotplug/firmware 18 download/extract them, and then copy them to /usr/lib/hotplug/firmware
19 or /lib/firmware (depending on configuration of firmware hotplug). 19 or /lib/firmware (depending on configuration of firmware hotplug).
20 20