media: ivtv/cx18: remove ivtvdriver.org references

That URL is no longer valid, so either remove references to it or
replace it with linuxtv.org.

Rather than updating the URL I've just dropped the cx18.rst driver
documentation since it was really out of date.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: awalls@md.metrocast.net
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/Documentation/media/uapi/v4l/pixfmt-reserved.rst b/Documentation/media/uapi/v4l/pixfmt-reserved.rst
index b2cd155e691bc85961bf3d08c11dbb83bd933c22..7d98a7bf9f1f13cc4348eccc0e599ccb00fcf362 100644 (file)
--- a/Documentation/media/uapi/v4l/pixfmt-reserved.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-reserved.rst
@@ -55,8 +55,7 @@ please make a proposal on the linux-media mailing list.
 
       - ``V4L2_PIX_FMT_HM12``
       - 'HM12'
-      - YUV 4:2:0 format used by the IVTV driver,
-       `http://www.ivtvdriver.org/ <http://www.ivtvdriver.org/>`__
+      - YUV 4:2:0 format used by the IVTV driver.
 
        The format is documented in the kernel sources in the file
        ``Documentation/media/v4l-drivers/cx2341x.rst``

diff --git a/Documentation/media/v4l-drivers/cx18.rst b/Documentation/media/v4l-drivers/cx18.rst
deleted file mode 100644 (file)
index 16895a7..0000000
--- a/Documentation/media/v4l-drivers/cx18.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0
-
-The cx18 driver
-===============
-
-.. note::
-
-   This documentation is outdated.
-
-Some notes regarding the cx18 driver for the Conexant CX23418 MPEG
-encoder chip:
-
-1) Currently supported are:
-
-       - Hauppauge HVR-1600
-       - Compro VideoMate H900
-       - Yuan MPC718
-       - Conexant Raptor PAL/SECAM devkit
-
-2) Some people have problems getting the i2c bus to work.
-   The symptom is that the eeprom cannot be read and the card is
-   unusable. This is probably fixed, but if you have problems
-   then post to the video4linux or ivtv-users mailing list.
-
-3) VBI (raw or sliced) has not yet been implemented.
-
-4) MPEG indexing is not yet implemented.
-
-5) The driver is still a bit rough around the edges, this should
-   improve over time.
-
-
-Firmware:
-
-You can obtain the firmware files here:
-
-http://dl.ivtvdriver.org/ivtv/firmware/cx18-firmware.tar.gz
-
-Untar and copy the .fw files to your firmware directory.

diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst
index c4c78a28654c0b441fa6a8f2864a13db02b4deba..b41fea23fe5d579d4d72ee8117e65837198eaa53 100644 (file)
--- a/Documentation/media/v4l-drivers/index.rst
+++ b/Documentation/media/v4l-drivers/index.rst
@@ -38,7 +38,6 @@ For more details see the file COPYING in the source distribution of Linux.
        bttv
        cafe_ccic
        cpia2
-       cx18
        cx2341x
        cx88
        davinci-vpbe

diff --git a/MAINTAINERS b/MAINTAINERS
index eefa1e066655002144f24998e79121dc38df5e01..87f3d89d44a2b131909538da55ae1692b3ce78c4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4427,13 +4427,10 @@ F:      drivers/net/wireless/st/cw1200/
 
 CX18 VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
-L:     ivtv-devel@ivtvdriver.org (subscribers-only)
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     https://linuxtv.org
-W:     http://www.ivtvdriver.org/index.php/Cx18
 S:     Maintained
-F:     Documentation/media/v4l-drivers/cx18*
 F:     drivers/media/pci/cx18/
 F:     include/uapi/linux/ivtv*
 
@@ -8836,10 +8833,9 @@ F:       drivers/media/tuners/it913x*
 
 IVTV VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
-L:     ivtv-devel@ivtvdriver.org (subscribers-only)
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
-W:     http://www.ivtvdriver.org
+W:     https://linuxtv.org
 S:     Maintained
 F:     Documentation/media/v4l-drivers/ivtv*
 F:     drivers/media/pci/ivtv/

diff --git a/drivers/media/pci/cx18/cx18-cards.c b/drivers/media/pci/cx18/cx18-cards.c
index cf118760d124e479c4d207e65bc7c7b6c017d5e2..ecbe76f1ca632b93b42e53bba06819dab543ade6 100644 (file)
--- a/drivers/media/pci/cx18/cx18-cards.c
+++ b/drivers/media/pci/cx18/cx18-cards.c
@@ -245,7 +245,7 @@ static const struct cx18_card cx18_card_mpc718 = {
        .type = CX18_CARD_YUAN_MPC718,
        .name = "Yuan MPC718 MiniPCI DVB-T/Analog",
        .comment = "Experimenters needed for device to work well.\n"
-                 "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
+                 "\tTo help, mail the linux-media list (www.linuxtv.org).\n",
        .v4l2_capabilities = CX18_CAP_ENCODER,
        .hw_audio_ctrl = CX18_HW_418_AV,
        .hw_muxer = CX18_HW_GPIO_MUX,
@@ -305,7 +305,7 @@ static const struct cx18_card cx18_card_gotview_dvd3 = {
        .type = CX18_CARD_GOTVIEW_PCI_DVD3,
        .name = "GoTView PCI DVD3 Hybrid",
        .comment = "Experimenters needed for device to work well.\n"
-                 "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
+                 "\tTo help, mail the linux-media list (www.linuxtv.org).\n",
        .v4l2_capabilities = CX18_CAP_ENCODER,
        .hw_audio_ctrl = CX18_HW_418_AV,
        .hw_muxer = CX18_HW_GPIO_MUX,
@@ -419,7 +419,7 @@ static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = {
        .type = CX18_CARD_TOSHIBA_QOSMIO_DVBT,
        .name = "Toshiba Qosmio DVB-T/Analog",
        .comment = "Experimenters and photos needed for device to work well.\n"
-                 "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
+                 "\tTo help, mail the linux-media list (www.linuxtv.org).\n",
        .v4l2_capabilities = CX18_CAP_ENCODER,
        .hw_audio_ctrl = CX18_HW_418_AV,
        .hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_RESET_CTRL,
@@ -462,7 +462,7 @@ static const struct cx18_card cx18_card_leadtek_pvr2100 = {
        .type = CX18_CARD_LEADTEK_PVR2100,
        .name = "Leadtek WinFast PVR2100",
        .comment = "Experimenters and photos needed for device to work well.\n"
-                 "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
+                 "\tTo help, mail the linux-media list (www.linuxtv.org).\n",
        .v4l2_capabilities = CX18_CAP_ENCODER,
        .hw_audio_ctrl = CX18_HW_418_AV,
        .hw_muxer = CX18_HW_GPIO_MUX,

diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index fd47bd07ffd8070e53a48b37fa3e2c30b0c2d350..16119f4e940498a315727c692fb357f4f75f2503 100644 (file)
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -676,7 +676,7 @@ done:
                         cx->pci_dev->subsystem_device);
                CX18_ERR("Defaulting to %s card\n", cx->card->name);
                CX18_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");
-               CX18_ERR("card you have to the ivtv-devel mailinglist (www.ivtvdriver.org)\n");
+               CX18_ERR("card you have to the linux-media mailinglist (www.linuxtv.org)\n");
                CX18_ERR("Prefix your subject line with [UNKNOWN CX18 CARD].\n");
        }
        cx->v4l2_cap = cx->card->v4l2_capabilities;

diff --git a/drivers/media/pci/ivtv/Kconfig b/drivers/media/pci/ivtv/Kconfig
index 36c089103cf939ef6ce561dfa4b8e52e7dd43a0c..c729e54692c473e1d7d74864e3e41cb9373b9a22 100644 (file)
--- a/drivers/media/pci/ivtv/Kconfig
+++ b/drivers/media/pci/ivtv/Kconfig
@@ -24,7 +24,7 @@ config VIDEO_IVTV
          PCI personal video recorder devices.
 
          This is used in devices such as the Hauppauge PVR-150/250/350/500
-         cards. There is a driver homepage at <http://www.ivtvdriver.org>.
+         cards.
 
          To compile this driver as a module, choose M here: the
          module will be called ivtv.
@@ -67,8 +67,7 @@ config VIDEO_FB_IVTV
          This is a framebuffer driver for the Conexant cx23415 MPEG
          encoder/decoder.
 
-         This is used in the Hauppauge PVR-350 card. There is a driver
-         homepage at <http://www.ivtvdriver.org>.
+         This is used in the Hauppauge PVR-350 card.
 
          To compile this driver as a module, choose M here: the
          module will be called ivtvfb.

diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index 3f3f40ea890bbc045376a3d15400d336143fc2ec..88dec72f29dccc01a7aaa6715fc8215f5e452087 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -23,7 +23,6 @@
  * Driver for the Conexant CX23415/CX23416 chip.
  * Author: Kevin Thayer (nufan_wfk at yahoo.com)
  * License: GPL
- * http://www.ivtvdriver.org
  *
  * -----
  * MPG600/MPG160 support by  T.Adachi <tadachi@tadachi-net.com>
@@ -723,7 +722,7 @@ done:
                IVTV_ERR("              %s based\n", chipname);
                IVTV_ERR("Defaulting to %s card\n", itv->card->name);
                IVTV_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");
-               IVTV_ERR("card you have to the ivtv-devel mailinglist (www.ivtvdriver.org)\n");
+               IVTV_ERR("card you have to the linux-media mailinglist (www.linuxtv.org)\n");
                IVTV_ERR("Prefix your subject line with [UNKNOWN IVTV CARD].\n");
        }
        itv->v4l2_cap = itv->card->v4l2_capabilities;

diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
index cafba6b1055df7f214906c187d6d80f4d05278b9..e5efe525ad7bf91dc726c78581d91a5ddce9a75e 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-driver.h
+++ b/drivers/media/pci/ivtv/ivtv-driver.h
@@ -28,7 +28,6 @@
  * Driver for the cx23415/6 chip.
  * Author: Kevin Thayer (nufan_wfk at yahoo.com)
  * License: GPL
- * http://www.ivtvdriver.org
  *
  * -----
  * MPG600/MPG160 support by  T.Adachi <tadachi@tadachi-net.com>