[media] cx25821: Remove bad strcpy to read-only char*

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / cx25821 / cx25821-core.c

diff --git a/drivers/media/video/cx25821/cx25821-core.c b/drivers/media/video/cx25821/cx25821-core.c
index 7930ca58349f60fc274d4f997bad98c3c7e2722b..f11f6f07e9154cd4d00790031d3da5e63c1ec8d1 100644 (file)
--- a/drivers/media/video/cx25821/cx25821-core.c
+++ b/drivers/media/video/cx25821/cx25821-core.c
@@ -379,14 +379,6 @@ static inline int i2c_slave_did_ack(struct i2c_adapter *i2c_adap)
        return cx_read(bus->reg_stat) & 0x01;
 }
 
-void cx_i2c_read_print(struct cx25821_dev *dev, u32 reg, const char *reg_string)
-{
-       int tmp = 0;
-       u32 value = 0;
-
-       value = cx25821_i2c_read(&dev->i2c_bus[0], reg, &tmp);
-}
-
 static void cx25821_registers_init(struct cx25821_dev *dev)
 {
        u32 tmp;
@@ -895,7 +887,7 @@ static void cx25821_iounmap(struct cx25821_dev *dev)
 
 static int cx25821_dev_setup(struct cx25821_dev *dev)
 {
-       int io_size = 0, i;
+       int i;
 
        pr_info("\n***********************************\n");
        pr_info("cx25821 set up\n");
@@ -912,9 +904,6 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
        list_add_tail(&dev->devlist, &cx25821_devlist);
        mutex_unlock(&cx25821_devlist_mutex);
 
-       strcpy(cx25821_boards[UNKNOWN_BOARD].name, "unknown");
-       strcpy(cx25821_boards[CX25821_BOARD].name, "cx25821");
-
        if (dev->pci->device != 0x8210) {
                pr_info("%s(): Exiting. Incorrect Hardware device = 0x%02x\n",
                        __func__, dev->pci->device);
@@ -960,7 +949,6 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
 
        /* PCIe stuff */
        dev->base_io_addr = pci_resource_start(dev->pci, 0);
-       io_size = pci_resource_len(dev->pci, 0);
 
        if (!dev->base_io_addr) {
                CX25821_ERR("No PCI Memory resources, exiting!\n");
@@ -1317,13 +1305,12 @@ void cx25821_free_buffer(struct videobuf_queue *q, struct cx25821_buffer *buf)
 static irqreturn_t cx25821_irq(int irq, void *dev_id)
 {
        struct cx25821_dev *dev = dev_id;
-       u32 pci_status, pci_mask;
+       u32 pci_status;
        u32 vid_status;
        int i, handled = 0;
        u32 mask[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };
 
        pci_status = cx_read(PCI_INT_STAT);
-       pci_mask = cx_read(PCI_INT_MSK);
 
        if (pci_status == 0)
                goto out;