media: cx231xx: Remove some deadcode

cx231xx_bcount and cx231xx_power_suspend() were added by the original
commit e0d3bafd0258 ("V4L/DVB (10954): Add cx231xx USB driver")
but remained unused.

cx231xx_dump_HH_reg() was added by
commit 64fbf4445526 ("[media] cx231xx: Added support for Carraera, Shelby,
RDx_253S and VIDEO_GRABBER")
but remained unused.

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c
index 9025693bc29503f4c0221bc605b58ef566623277..6139ef5d891d6be2ccc86a94085e56e753371360 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c
@@ -1338,39 +1338,6 @@ void update_HH_register_after_set_DIF(struct cx231xx *dev)
 */
 }
 
-void cx231xx_dump_HH_reg(struct cx231xx *dev)
-{
-       u32 value = 0;
-       u16  i = 0;
-
-       value = 0x45005390;
-       vid_blk_write_word(dev, 0x104, value);
-
-       for (i = 0x100; i < 0x140; i++) {
-               vid_blk_read_word(dev, i, &value);
-               dev_dbg(dev->dev, "reg0x%x=0x%x\n", i, value);
-               i = i+3;
-       }
-
-       for (i = 0x300; i < 0x400; i++) {
-               vid_blk_read_word(dev, i, &value);
-               dev_dbg(dev->dev, "reg0x%x=0x%x\n", i, value);
-               i = i+3;
-       }
-
-       for (i = 0x400; i < 0x440; i++) {
-               vid_blk_read_word(dev, i,  &value);
-               dev_dbg(dev->dev, "reg0x%x=0x%x\n", i, value);
-               i = i+3;
-       }
-
-       vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value);
-       dev_dbg(dev->dev, "AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);
-       vid_blk_write_word(dev, AFE_CTRL_C2HH_SRC_CTRL, 0x4485D390);
-       vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value);
-       dev_dbg(dev->dev, "AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);
-}
-
 #if 0
 static void cx231xx_dump_SC_reg(struct cx231xx *dev)
 {
@@ -2460,30 +2427,6 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
        return status;
 }
 
-int cx231xx_power_suspend(struct cx231xx *dev)
-{
-       u8 value[4] = { 0, 0, 0, 0 };
-       u32 tmp = 0;
-       int status = 0;
-
-       status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN,
-                                      value, 4);
-       if (status > 0)
-               return status;
-
-       tmp = le32_to_cpu(*((__le32 *) value));
-       tmp &= (~PWR_MODE_MASK);
-
-       value[0] = (u8) tmp;
-       value[1] = (u8) (tmp >> 8);
-       value[2] = (u8) (tmp >> 16);
-       value[3] = (u8) (tmp >> 24);
-       status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER, PWR_CTL_EN,
-                                       value, 4);
-
-       return status;
-}
-
 /******************************************************************************
  *                  S T R E A M    C O N T R O L   functions                  *
  ******************************************************************************/

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 8bb0103f7dd4b17204f1921661d22f3accb1ff46..691f073892b36ce64812d2127b30639618e5deed 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -989,7 +989,6 @@ struct cx231xx_board cx231xx_boards[] = {
                } },
        },
 };
-const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
 
 /* table of devices that work with this driver */
 struct usb_device_id cx231xx_id_table[] = {

diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index 228ecea4cfe4694be1b891e3a6a345a71e791ce6..19f5036a78d7f42aebdfe164025477a68eadf1b7 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -790,7 +790,6 @@ void cx231xx_set_DIF_bandpass(struct cx231xx *dev, u32 if_freq,
                                         u8 spectral_invert, u32 mode);
 void cx231xx_Setup_AFE_for_LowIF(struct cx231xx *dev);
 void reset_s5h1432_demod(struct cx231xx *dev);
-void cx231xx_dump_HH_reg(struct cx231xx *dev);
 void update_HH_register_after_set_DIF(struct cx231xx *dev);
 
 
@@ -905,7 +904,6 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type);
 
 /* Power control functions */
 int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode);
-int cx231xx_power_suspend(struct cx231xx *dev);
 
 /* chip specific control functions */
 int cx231xx_init_ctrl_pin_status(struct cx231xx *dev);
@@ -949,7 +947,6 @@ extern void cx231xx_pre_card_setup(struct cx231xx *dev);
 extern void cx231xx_card_setup(struct cx231xx *dev);
 extern struct cx231xx_board cx231xx_boards[];
 extern struct usb_device_id cx231xx_id_table[];
-extern const unsigned int cx231xx_bcount;
 int cx231xx_tuner_callback(void *ptr, int component, int command, int arg);
 
 /* cx23885-417.c                                               */