diff options
author | Antti Palosaari <crope@iki.fi> | 2014-12-15 14:30:02 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-03 16:13:17 -0200 |
commit | 725b7f30463ab54b453a7113e7fb7148cfe636a2 (patch) | |
tree | e3ba4b255f8f340ee99a902fcd4b8ad0de933f98 /drivers/media | |
parent | 0aa32ef9b38f9683b4ddaab9ac9bee8f75d872d2 (diff) |
[media] rtl2832_sdr: rename state variable from 's' to 'dev'
'dev' sounds better than 's' for such variable.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb-frontends/rtl2832_sdr.c | 858 |
1 files changed, 429 insertions, 429 deletions
diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c index 2896b47c29d8..3af869c5497d 100644 --- a/drivers/media/dvb-frontends/rtl2832_sdr.c +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c @@ -107,7 +107,7 @@ struct rtl2832_sdr_frame_buf { struct list_head list; }; -struct rtl2832_sdr_state { +struct rtl2832_sdr_dev { #define POWER_ON (1 << 1) #define URB_BUF (1 << 2) unsigned long flags; @@ -161,7 +161,7 @@ struct rtl2832_sdr_state { }; /* write multiple hardware registers */ -static int rtl2832_sdr_wr(struct rtl2832_sdr_state *s, u8 reg, const u8 *val, +static int rtl2832_sdr_wr(struct rtl2832_sdr_dev *dev, u8 reg, const u8 *val, int len) { int ret; @@ -170,7 +170,7 @@ static int rtl2832_sdr_wr(struct rtl2832_sdr_state *s, u8 reg, const u8 *val, u8 buf[MAX_WR_XFER_LEN]; struct i2c_msg msg[1] = { { - .addr = s->cfg->i2c_addr, + .addr = dev->cfg->i2c_addr, .flags = 0, .len = 1 + len, .buf = buf, @@ -183,11 +183,11 @@ static int rtl2832_sdr_wr(struct rtl2832_sdr_state *s, u8 reg, const u8 *val, buf[0] = reg; memcpy(&buf[1], val, len); - ret = i2c_transfer(s->i2c, msg, 1); + ret = i2c_transfer(dev->i2c, msg, 1); if (ret == 1) { ret = 0; } else { - dev_err(&s->i2c->dev, + dev_err(&dev->i2c->dev, "%s: I2C wr failed=%d reg=%02x len=%d\n", KBUILD_MODNAME, ret, reg, len); ret = -EREMOTEIO; @@ -196,28 +196,28 @@ static int rtl2832_sdr_wr(struct rtl2832_sdr_state *s, u8 reg, const u8 *val, } /* read multiple hardware registers */ -static int rtl2832_sdr_rd(struct rtl2832_sdr_state *s, u8 reg, u8 *val, int len) +static int rtl2832_sdr_rd(struct rtl2832_sdr_dev *dev, u8 reg, u8 *val, int len) { int ret; struct i2c_msg msg[2] = { { - .addr = s->cfg->i2c_addr, + .addr = dev->cfg->i2c_addr, .flags = 0, .len = 1, .buf = ®, }, { - .addr = s->cfg->i2c_addr, + .addr = dev->cfg->i2c_addr, .flags = I2C_M_RD, .len = len, .buf = val, } }; - ret = i2c_transfer(s->i2c, msg, 2); + ret = i2c_transfer(dev->i2c, msg, 2); if (ret == 2) { ret = 0; } else { - dev_err(&s->i2c->dev, + dev_err(&dev->i2c->dev, "%s: I2C rd failed=%d reg=%02x len=%d\n", KBUILD_MODNAME, ret, reg, len); ret = -EREMOTEIO; @@ -226,7 +226,7 @@ static int rtl2832_sdr_rd(struct rtl2832_sdr_state *s, u8 reg, u8 *val, int len) } /* write multiple registers */ -static int rtl2832_sdr_wr_regs(struct rtl2832_sdr_state *s, u16 reg, +static int rtl2832_sdr_wr_regs(struct rtl2832_sdr_dev *dev, u16 reg, const u8 *val, int len) { int ret; @@ -234,19 +234,19 @@ static int rtl2832_sdr_wr_regs(struct rtl2832_sdr_state *s, u16 reg, u8 bank = (reg >> 8) & 0xff; /* switch bank if needed */ - if (bank != s->bank) { - ret = rtl2832_sdr_wr(s, 0x00, &bank, 1); + if (bank != dev->bank) { + ret = rtl2832_sdr_wr(dev, 0x00, &bank, 1); if (ret) return ret; - s->bank = bank; + dev->bank = bank; } - return rtl2832_sdr_wr(s, reg2, val, len); + return rtl2832_sdr_wr(dev, reg2, val, len); } /* read multiple registers */ -static int rtl2832_sdr_rd_regs(struct rtl2832_sdr_state *s, u16 reg, u8 *val, +static int rtl2832_sdr_rd_regs(struct rtl2832_sdr_dev *dev, u16 reg, u8 *val, int len) { int ret; @@ -254,33 +254,33 @@ static int rtl2832_sdr_rd_regs(struct rtl2832_sdr_state *s, u16 reg, u8 *val, u8 bank = (reg >> 8) & 0xff; /* switch bank if needed */ - if (bank != s->bank) { - ret = rtl2832_sdr_wr(s, 0x00, &bank, 1); + if (bank != dev->bank) { + ret = rtl2832_sdr_wr(dev, 0x00, &bank, 1); if (ret) return ret; - s->bank = bank; + dev->bank = bank; } - return rtl2832_sdr_rd(s, reg2, val, len); + return rtl2832_sdr_rd(dev, reg2, val, len); } /* write single register */ -static int rtl2832_sdr_wr_reg(struct rtl2832_sdr_state *s, u16 reg, u8 val) +static int rtl2832_sdr_wr_reg(struct rtl2832_sdr_dev *dev, u16 reg, u8 val) { - return rtl2832_sdr_wr_regs(s, reg, &val, 1); + return rtl2832_sdr_wr_regs(dev, reg, &val, 1); } #if 0 /* read single register */ -static int rtl2832_sdr_rd_reg(struct rtl2832_sdr_state *s, u16 reg, u8 *val) +static int rtl2832_sdr_rd_reg(struct rtl2832_sdr_dev *dev, u16 reg, u8 *val) { - return rtl2832_sdr_rd_regs(s, reg, val, 1); + return rtl2832_sdr_rd_regs(dev, reg, val, 1); } #endif /* write single register with mask */ -static int rtl2832_sdr_wr_reg_mask(struct rtl2832_sdr_state *s, u16 reg, +static int rtl2832_sdr_wr_reg_mask(struct rtl2832_sdr_dev *dev, u16 reg, u8 val, u8 mask) { int ret; @@ -288,7 +288,7 @@ static int rtl2832_sdr_wr_reg_mask(struct rtl2832_sdr_state *s, u16 reg, /* no need for read if whole reg is written */ if (mask != 0xff) { - ret = rtl2832_sdr_rd_regs(s, reg, &tmp, 1); + ret = rtl2832_sdr_rd_regs(dev, reg, &tmp, 1); if (ret) return ret; @@ -297,18 +297,18 @@ static int rtl2832_sdr_wr_reg_mask(struct rtl2832_sdr_state *s, u16 reg, val |= tmp; } - return rtl2832_sdr_wr_regs(s, reg, &val, 1); + return rtl2832_sdr_wr_regs(dev, reg, &val, 1); } #if 0 /* read single register with mask */ -static int rtl2832_sdr_rd_reg_mask(struct rtl2832_sdr_state *s, u16 reg, +static int rtl2832_sdr_rd_reg_mask(struct rtl2832_sdr_dev *dev, u16 reg, u8 *val, u8 mask) { int ret, i; u8 tmp; - ret = rtl2832_sdr_rd_regs(s, reg, &tmp, 1); + ret = rtl2832_sdr_rd_regs(dev, reg, &tmp, 1); if (ret) return ret; @@ -327,33 +327,33 @@ static int rtl2832_sdr_rd_reg_mask(struct rtl2832_sdr_state *s, u16 reg, /* Private functions */ static struct rtl2832_sdr_frame_buf *rtl2832_sdr_get_next_fill_buf( - struct rtl2832_sdr_state *s) + struct rtl2832_sdr_dev *dev) { unsigned long flags; struct rtl2832_sdr_frame_buf *buf = NULL; - spin_lock_irqsave(&s->queued_bufs_lock, flags); - if (list_empty(&s->queued_bufs)) + spin_lock_irqsave(&dev->queued_bufs_lock, flags); + if (list_empty(&dev->queued_bufs)) goto leave; - buf = list_entry(s->queued_bufs.next, + buf = list_entry(dev->queued_bufs.next, struct rtl2832_sdr_frame_buf, list); list_del(&buf->list); leave: - spin_unlock_irqrestore(&s->queued_bufs_lock, flags); + spin_unlock_irqrestore(&dev->queued_bufs_lock, flags); return buf; } -static unsigned int rtl2832_sdr_convert_stream(struct rtl2832_sdr_state *s, +static unsigned int rtl2832_sdr_convert_stream(struct rtl2832_sdr_dev *dev, void *dst, const u8 *src, unsigned int src_len) { unsigned int dst_len; - if (s->pixelformat == V4L2_SDR_FMT_CU8) { + if (dev->pixelformat == V4L2_SDR_FMT_CU8) { /* native stream, no need to convert */ memcpy(dst, src, src_len); dst_len = src_len; - } else if (s->pixelformat == V4L2_SDR_FMT_CU16LE) { + } else if (dev->pixelformat == V4L2_SDR_FMT_CU16LE) { /* convert u8 to u16 */ unsigned int i; u16 *u16dst = dst; @@ -366,22 +366,22 @@ static unsigned int rtl2832_sdr_convert_stream(struct rtl2832_sdr_state *s, } /* calculate sample rate and output it in 10 seconds intervals */ - if (unlikely(time_is_before_jiffies(s->jiffies_next))) { + if (unlikely(time_is_before_jiffies(dev->jiffies_next))) { #define MSECS 10000UL unsigned int msecs = jiffies_to_msecs(jiffies - - s->jiffies_next + msecs_to_jiffies(MSECS)); - unsigned int samples = s->sample - s->sample_measured; + dev->jiffies_next + msecs_to_jiffies(MSECS)); + unsigned int samples = dev->sample - dev->sample_measured; - s->jiffies_next = jiffies + msecs_to_jiffies(MSECS); - s->sample_measured = s->sample; - dev_dbg(&s->udev->dev, + dev->jiffies_next = jiffies + msecs_to_jiffies(MSECS); + dev->sample_measured = dev->sample; + dev_dbg(&dev->udev->dev, "slen=%u samples=%u msecs=%u sample rate=%lu\n", src_len, samples, msecs, samples * 1000UL / msecs); } /* total number of I+Q pairs */ - s->sample += src_len / 2; + dev->sample += src_len / 2; return dst_len; } @@ -392,10 +392,10 @@ static unsigned int rtl2832_sdr_convert_stream(struct rtl2832_sdr_state *s, */ static void rtl2832_sdr_urb_complete(struct urb *urb) { - struct rtl2832_sdr_state *s = urb->context; + struct rtl2832_sdr_dev *dev = urb->context; struct rtl2832_sdr_frame_buf *fbuf; - dev_dbg_ratelimited(&s->udev->dev, + dev_dbg_ratelimited(&dev->udev->dev, "status=%d length=%d/%d errors=%d\n", urb->status, urb->actual_length, urb->transfer_buffer_length, urb->error_count); @@ -409,7 +409,7 @@ static void rtl2832_sdr_urb_complete(struct urb *urb) case -ESHUTDOWN: return; default: /* error */ - dev_err_ratelimited(&s->udev->dev, "urb failed=%d\n", + dev_err_ratelimited(&dev->udev->dev, "urb failed=%d\n", urb->status); break; } @@ -418,190 +418,190 @@ static void rtl2832_sdr_urb_complete(struct urb *urb) void *ptr; unsigned int len; /* get free framebuffer */ - fbuf = rtl2832_sdr_get_next_fill_buf(s); + fbuf = rtl2832_sdr_get_next_fill_buf(dev); if (unlikely(fbuf == NULL)) { - s->vb_full++; - dev_notice_ratelimited(&s->udev->dev, + dev->vb_full++; + dev_notice_ratelimited(&dev->udev->dev, "videobuf is full, %d packets dropped\n", - s->vb_full); + dev->vb_full); goto skip; } /* fill framebuffer */ ptr = vb2_plane_vaddr(&fbuf->vb, 0); - len = rtl2832_sdr_convert_stream(s, ptr, urb->transfer_buffer, + len = rtl2832_sdr_convert_stream(dev, ptr, urb->transfer_buffer, urb->actual_length); vb2_set_plane_payload(&fbuf->vb, 0, len); v4l2_get_timestamp(&fbuf->vb.v4l2_buf.timestamp); - fbuf->vb.v4l2_buf.sequence = s->sequence++; + fbuf->vb.v4l2_buf.sequence = dev->sequence++; vb2_buffer_done(&fbuf->vb, VB2_BUF_STATE_DONE); } skip: usb_submit_urb(urb, GFP_ATOMIC); } -static int rtl2832_sdr_kill_urbs(struct rtl2832_sdr_state *s) +static int rtl2832_sdr_kill_urbs(struct rtl2832_sdr_dev *dev) { int i; - for (i = s->urbs_submitted - 1; i >= 0; i--) { - dev_dbg(&s->udev->dev, "kill urb=%d\n", i); + for (i = dev->urbs_submitted - 1; i >= 0; i--) { + dev_dbg(&dev->udev->dev, "kill urb=%d\n", i); /* stop the URB */ - usb_kill_urb(s->urb_list[i]); + usb_kill_urb(dev->urb_list[i]); } - s->urbs_submitted = 0; + dev->urbs_submitted = 0; return 0; } -static int rtl2832_sdr_submit_urbs(struct rtl2832_sdr_state *s) +static int rtl2832_sdr_submit_urbs(struct rtl2832_sdr_dev *dev) { int i, ret; - for (i = 0; i < s->urbs_initialized; i++) { - dev_dbg(&s->udev->dev, "submit urb=%d\n", i); - ret = usb_submit_urb(s->urb_list[i], GFP_ATOMIC); + for (i = 0; i < dev->urbs_initialized; i++) { + dev_dbg(&dev->udev->dev, "submit urb=%d\n", i); + ret = usb_submit_urb(dev->urb_list[i], GFP_ATOMIC); if (ret) { - dev_err(&s->udev->dev, + dev_err(&dev->udev->dev, "Could not submit urb no. %d - get them all back\n", i); - rtl2832_sdr_kill_urbs(s); + rtl2832_sdr_kill_urbs(dev); return ret; } - s->urbs_submitted++; + dev->urbs_submitted++; } return 0; } -static int rtl2832_sdr_free_stream_bufs(struct rtl2832_sdr_state *s) +static int rtl2832_sdr_free_stream_bufs(struct rtl2832_sdr_dev *dev) { - if (s->flags & USB_STATE_URB_BUF) { - while (s->buf_num) { - s->buf_num--; - dev_dbg(&s->udev->dev, "free buf=%d\n", s->buf_num); - usb_free_coherent(s->udev, s->buf_size, - s->buf_list[s->buf_num], - s->dma_addr[s->buf_num]); + if (dev->flags & USB_STATE_URB_BUF) { + while (dev->buf_num) { + dev->buf_num--; + dev_dbg(&dev->udev->dev, "free buf=%d\n", dev->buf_num); + usb_free_coherent(dev->udev, dev->buf_size, + dev->buf_list[dev->buf_num], + dev->dma_addr[dev->buf_num]); } } - s->flags &= ~USB_STATE_URB_BUF; + dev->flags &= ~USB_STATE_URB_BUF; return 0; } -static int rtl2832_sdr_alloc_stream_bufs(struct rtl2832_sdr_state *s) +static int rtl2832_sdr_alloc_stream_bufs(struct rtl2832_sdr_dev *dev) { - s->buf_num = 0; - s->buf_size = BULK_BUFFER_SIZE; + dev->buf_num = 0; + dev->buf_size = BULK_BUFFER_SIZE; - dev_dbg(&s->udev->dev, "all in all I will use %u bytes for streaming\n", + dev_dbg(&dev->udev->dev, "all in all I will use %u bytes for streaming\n", MAX_BULK_BUFS * BULK_BUFFER_SIZE); - for (s->buf_num = 0; s->buf_num < MAX_BULK_BUFS; s->buf_num++) { - s->buf_list[s->buf_num] = usb_alloc_coherent(s->udev, + for (dev->buf_num = 0; dev->buf_num < MAX_BULK_BUFS; dev->buf_num++) { + dev->buf_list[dev->buf_num] = usb_alloc_coherent(dev->udev, BULK_BUFFER_SIZE, GFP_ATOMIC, - &s->dma_addr[s->buf_num]); - if (!s->buf_list[s->buf_num]) { - dev_dbg(&s->udev->dev, "alloc buf=%d failed\n", - s->buf_num); - rtl2832_sdr_free_stream_bufs(s); + &dev->dma_addr[dev->buf_num]); + if (!dev->buf_list[dev->buf_num]) { + dev_dbg(&dev->udev->dev, "alloc buf=%d failed\n", + dev->buf_num); + rtl2832_sdr_free_stream_bufs(dev); return -ENOMEM; } - dev_dbg(&s->udev->dev, "alloc buf=%d %p (dma %llu)\n", - s->buf_num, s->buf_list[s->buf_num], - (long long)s->dma_addr[s->buf_num]); - s->flags |= USB_STATE_URB_BUF; + dev_dbg(&dev->udev->dev, "alloc buf=%d %p (dma %llu)\n", + dev->buf_num, dev->buf_list[dev->buf_num], + (long long)dev->dma_addr[dev->buf_num]); + dev->flags |= USB_STATE_URB_BUF; } return 0; } -static int rtl2832_sdr_free_urbs(struct rtl2832_sdr_state *s) +static int rtl2832_sdr_free_urbs(struct rtl2832_sdr_dev *dev) { int i; - rtl2832_sdr_kill_urbs(s); + rtl2832_sdr_kill_urbs(dev); - for (i = s->urbs_initialized - 1; i >= 0; i--) { - if (s->urb_list[i]) { - dev_dbg(&s->udev->dev, "free urb=%d\n", i); + for (i = dev->urbs_initialized - 1; i >= 0; i--) { + if (dev->urb_list[i]) { + dev_dbg(&dev->udev->dev, "free urb=%d\n", i); /* free the URBs */ - usb_free_urb(s->urb_list[i]); + usb_free_urb(dev->urb_list[i]); } } - s->urbs_initialized = 0; + dev->urbs_initialized = 0; return 0; } -static int rtl2832_sdr_alloc_urbs(struct rtl2832_sdr_state *s) +static int rtl2832_sdr_alloc_urbs(struct rtl2832_sdr_dev *dev) { int i, j; /* allocate the URBs */ for (i = 0; i < MAX_BULK_BUFS; i++) { - dev_dbg(&s->udev->dev, "alloc urb=%d\n", i); - s->urb_list[i] = usb_alloc_urb(0, GFP_ATOMIC); - if (!s->urb_list[i]) { - dev_dbg(&s->udev->dev, "failed\n"); + dev_dbg(&dev->udev->dev, "alloc urb=%d\n", i); + dev->urb_list[i] = usb_alloc_urb(0, GFP_ATOMIC); + if (!dev->urb_list[i]) { + dev_dbg(&dev->udev->dev, "failed\n"); for (j = 0; j < i; j++) - usb_free_urb(s->urb_list[j]); + usb_free_urb(dev->urb_list[j]); return -ENOMEM; } - usb_fill_bulk_urb(s->urb_list[i], - s->udev, - usb_rcvbulkpipe(s->udev, 0x81), - s->buf_list[i], + usb_fill_bulk_urb(dev->urb_list[i], + dev->udev, + usb_rcvbulkpipe(dev->udev, 0x81), + dev->buf_list[i], BULK_BUFFER_SIZE, - rtl2832_sdr_urb_complete, s); + rtl2832_sdr_urb_complete, dev); - s->urb_list[i]->transfer_flags = URB_NO_TRANSFER_DMA_MAP; - s->urb_list[i]->transfer_dma = s->dma_addr[i]; - s->urbs_initialized++; + dev->urb_list[i]->transfer_flags = URB_NO_TRANSFER_DMA_MAP; + dev->urb_list[i]->transfer_dma = dev->dma_addr[i]; + dev->urbs_initialized++; } return 0; } /* Must be called with vb_queue_lock hold */ -static void rtl2832_sdr_cleanup_queued_bufs(struct rtl2832_sdr_state *s) +static void rtl2832_sdr_cleanup_queued_bufs(struct rtl2832_sdr_dev *dev) { unsigned long flags; - dev_dbg(&s->udev->dev, "\n"); + dev_dbg(&dev->udev->dev, "\n"); - spin_lock_irqsave(&s->queued_bufs_lock, flags); - while (!list_empty(&s->queued_bufs)) { + spin_lock_irqsave(&dev->queued_bufs_lock, flags); + while (!list_empty(&dev->queued_bufs)) { struct rtl2832_sdr_frame_buf *buf; - buf = list_entry(s->queued_bufs.next, + buf = list_entry(dev->queued_bufs.next, struct rtl2832_sdr_frame_buf, list); list_del(&buf->list); vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); } - spin_unlock_irqrestore(&s->queued_bufs_lock, flags); + spin_unlock_irqrestore(&dev->queued_bufs_lock, flags); } /* The user yanked out the cable... */ static void rtl2832_sdr_release_sec(struct dvb_frontend *fe) { - struct rtl2832_sdr_state *s = fe->sec_priv; + struct rtl2832_sdr_dev *dev = fe->sec_priv; - dev_dbg(&s->udev->dev, "\n"); + dev_dbg(&dev->udev->dev, "\n"); - mutex_lock(&s->vb_queue_lock); - mutex_lock(&s->v4l2_lock); + mutex_lock(&dev->vb_queue_lock); + mutex_lock(&dev->v4l2_lock); /* No need to keep the urbs around after disconnection */ - s->udev = NULL; + dev->udev = NULL; - v4l2_device_disconnect(&s->v4l2_dev); - video_unregister_device(&s->vdev); - mutex_unlock(&s->v4l2_lock); - mutex_unlock(&s->vb_queue_lock); + v4l2_device_disconnect(&dev->v4l2_dev); + video_unregister_device(&dev->vdev); + mutex_unlock(&dev->v4l2_lock); + mutex_unlock(&dev->vb_queue_lock); - v4l2_device_put(&s->v4l2_dev); + v4l2_device_put(&dev->v4l2_dev); fe->sec_priv = NULL; } @@ -609,13 +609,13 @@ static void rtl2832_sdr_release_sec(struct dvb_frontend *fe) static int rtl2832_sdr_querycap(struct file *file, void *fh, struct v4l2_capability *cap) { - struct rtl2832_sdr_state *s = video_drvdata(file); + struct rtl2832_sdr_dev *dev = video_drvdata(file); - dev_dbg(&s->udev->dev, "\n"); + dev_dbg(&dev->udev->dev, "\n"); strlcpy(cap->driver, KBUILD_MODNAME, sizeof(cap->driver)); - strlcpy(cap->card, s->vdev.name, sizeof(cap->card)); - usb_make_path(s->udev, cap->bus_info, sizeof(cap->bus_info)); + strlcpy(cap->card, dev->vdev.name, sizeof(cap->card)); + usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); cap->device_caps = V4L2_CAP_SDR_CAPTURE | V4L2_CAP_STREAMING | V4L2_CAP_READWRITE | V4L2_CAP_TUNER; cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; @@ -627,26 +627,26 @@ static int rtl2832_sdr_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, unsigned int *nbuffers, unsigned int *nplanes, unsigned int sizes[], void *alloc_ctxs[]) { - struct rtl2832_sdr_state *s = vb2_get_drv_priv(vq); + struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vq); - dev_dbg(&s->udev->dev, "nbuffers=%d\n", *nbuffers); + dev_dbg(&dev->udev->dev, "nbuffers=%d\n", *nbuffers); /* Need at least 8 buffers */ if (vq->num_buffers + *nbuffers < 8) *nbuffers = 8 - vq->num_buffers; *nplanes = 1; - sizes[0] = PAGE_ALIGN(s->buffersize); - dev_dbg(&s->udev->dev, "nbuffers=%d sizes[0]=%d\n", + sizes[0] = PAGE_ALIGN(dev->buffersize); + dev_dbg(&dev->udev->dev, "nbuffers=%d sizes[0]=%d\n", *nbuffers, sizes[0]); return 0; } static int rtl2832_sdr_buf_prepare(struct vb2_buffer *vb) { - struct rtl2832_sdr_state *s = vb2_get_drv_priv(vb->vb2_queue); + struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vb->vb2_queue); /* Don't allow queing new buffers after device disconnection */ - if (!s->udev) + if (!dev->udev) return -ENODEV; return 0; @@ -654,46 +654,46 @@ static int rtl2832_sdr_buf_prepare(struct vb2_buffer *vb) static void rtl2832_sdr_buf_queue(struct vb2_buffer *vb) { - struct rtl2832_sdr_state *s = vb2_get_drv_priv(vb->vb2_queue); + struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct rtl2832_sdr_frame_buf *buf = container_of(vb, struct rtl2832_sdr_frame_buf, vb); unsigned long flags; /* Check the device has not disconnected between prep and queuing */ - if (!s->udev) { + if (!dev->udev) { vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); return; } - spin_lock_irqsave(&s->queued_bufs_lock, flags); - list_add_tail(&buf->list, &s->queued_bufs); - spin_unlock_irqrestore(&s->queued_bufs_lock, flags); + spin_lock_irqsave(&dev->queued_bufs_lock, flags); + list_add_tail(&buf->list, &dev->queued_bufs); + spin_unlock_irqrestore(&dev->queued_bufs_lock, flags); } -static int rtl2832_sdr_set_adc(struct rtl2832_sdr_state *s) +static int rtl2832_sdr_set_adc(struct rtl2832_sdr_dev *dev) { - struct dvb_frontend *fe = s->fe; + struct dvb_frontend *fe = dev->fe; int ret; unsigned int f_sr, f_if; u8 buf[4], u8tmp1, u8tmp2; u64 u64tmp; u32 u32tmp; - dev_dbg(&s->udev->dev, "f_adc=%u\n", s->f_adc); + dev_dbg(&dev->udev->dev, "f_adc=%u\n", dev->f_adc); - if (!test_bit(POWER_ON, &s->flags)) + if (!test_bit(POWER_ON, &dev->flags)) return 0; - if (s->f_adc == 0) + if (dev->f_adc == 0) return 0; - f_sr = s->f_adc; + f_sr = dev->f_adc; - ret = rtl2832_sdr_wr_regs(s, 0x13e, "\x00\x00", 2); + ret = rtl2832_sdr_wr_regs(dev, 0x13e, "\x00\x00", 2); if (ret) goto err; - ret = rtl2832_sdr_wr_regs(s, 0x115, "\x00\x00\x00\x00", 4); + ret = rtl2832_sdr_wr_regs(dev, 0x115, "\x00\x00\x00\x00", 4); if (ret) goto err; @@ -707,19 +707,19 @@ static int rtl2832_sdr_set_adc(struct rtl2832_sdr_state *s) goto err; /* program IF */ - u64tmp = f_if % s->cfg->xtal; + u64tmp = f_if % dev->cfg->xtal; u64tmp *= 0x400000; - u64tmp = div_u64(u64tmp, s->cfg->xtal); + u64tmp = div_u64(u64tmp, dev->cfg->xtal); u64tmp = -u64tmp; u32tmp = u64tmp & 0x3fffff; - dev_dbg(&s->udev->dev, "f_if=%u if_ctl=%08x\n", f_if, u32tmp); + dev_dbg(&dev->udev->dev, "f_if=%u if_ctl=%08x\n", f_if, u32tmp); buf[0] = (u32tmp >> 16) & 0xff; buf[1] = (u32tmp >> 8) & 0xff; buf[2] = (u32tmp >> 0) & 0xff; - ret = rtl2832_sdr_wr_regs(s, 0x119, buf, 3); + ret = rtl2832_sdr_wr_regs(dev, 0x119, buf, 3); if (ret) goto err; @@ -733,208 +733,208 @@ static int rtl2832_sdr_set_adc(struct rtl2832_sdr_state *s) u8tmp2 = 0xcd; /* enable ADC I, ADC Q */ } - ret = rtl2832_sdr_wr_reg(s, 0x1b1, u8tmp1); + ret = rtl2832_sdr_wr_reg(dev, 0x1b1, u8tmp1); if (ret) goto err; - ret = rtl2832_sdr_wr_reg(s, 0x008, u8tmp2); + ret = rtl2832_sdr_wr_reg(dev, 0x008, u8tmp2); if (ret) goto err; - ret = rtl2832_sdr_wr_reg(s, 0x006, 0x80); + ret = rtl2832_sdr_wr_reg(dev, 0x006, 0x80); if (ret) goto err; /* program sampling rate (resampling down) */ - u32tmp = div_u64(s->cfg->xtal * 0x400000ULL, f_sr * 4U); + u32tmp = div_u64(dev->cfg->xtal * 0x400000ULL, f_sr * 4U); u32tmp <<= 2; buf[0] = (u32tmp >> 24) & 0xff; buf[1] = (u32tmp >> 16) & 0xff; buf[2] = (u32tmp >> 8) & 0xff; buf[3] = (u32tmp >> 0) & 0xff; - ret = rtl2832_sdr_wr_regs(s, 0x19f, buf, 4); + ret = rtl2832_sdr_wr_regs(dev, 0x19f, buf, 4); if (ret) goto err; /* low-pass filter */ - ret = rtl2832_sdr_wr_regs(s, 0x11c, + ret = rtl2832_sdr_wr_regs(dev, 0x11c, "\xca\xdc\xd7\xd8\xe0\xf2\x0e\x35\x06\x50\x9c\x0d\x71\x11\x14\x71\x74\x19\x41\xa5", 20); if (ret) goto err; - ret = rtl2832_sdr_wr_regs(s, 0x017, "\x11\x10", 2); + ret = rtl2832_sdr_wr_regs(dev, 0x017, "\x11\x10", 2); if (ret) goto err; /* mode */ - ret = rtl2832_sdr_wr_regs(s, 0x019, "\x05", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x019, "\x05", 1); if (ret) goto err; - ret = rtl2832_sdr_wr_regs(s, 0x01a, "\x1b\x16\x0d\x06\x01\xff", 6); + ret = rtl2832_sdr_wr_regs(dev, 0x01a, "\x1b\x16\x0d\x06\x01\xff", 6); if (ret) goto err; /* FSM */ - ret = rtl2832_sdr_wr_regs(s, 0x192, "\x00\xf0\x0f", 3); + ret = rtl2832_sdr_wr_regs(dev, 0x192, "\x00\xf0\x0f", 3); if (ret) goto err; /* PID filter */ - ret = rtl2832_sdr_wr_regs(s, 0x061, "\x60", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x061, "\x60", 1); if (ret) goto err; /* used RF tuner based settings */ - switch (s->cfg->tuner) { + switch (dev->cfg->tuner) { case RTL2832_TUNER_E4000: - ret = rtl2832_sdr_wr_regs(s, 0x112, "\x5a", 1); - ret = rtl2832_sdr_wr_regs(s, 0x102, "\x40", 1); - ret = rtl2832_sdr_wr_regs(s, 0x103, "\x5a", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1c7, "\x30", 1); - ret = rtl2832_sdr_wr_regs(s, 0x104, "\xd0", 1); - ret = rtl2832_sdr_wr_regs(s, 0x105, "\xbe", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1c8, "\x18", 1); - ret = rtl2832_sdr_wr_regs(s, 0x106, "\x35", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1c9, "\x21", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1ca, "\x21", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1cb, "\x00", 1); - ret = rtl2832_sdr_wr_regs(s, 0x107, "\x40", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1cd, "\x10", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1ce, "\x10", 1); - ret = rtl2832_sdr_wr_regs(s, 0x108, "\x80", 1); - ret = rtl2832_sdr_wr_regs(s, 0x109, "\x7f", 1); - ret = rtl2832_sdr_wr_regs(s, 0x10a, "\x80", 1); - ret = rtl2832_sdr_wr_regs(s, 0x10b, "\x7f", 1); - ret = rtl2832_sdr_wr_regs(s, 0x00e, "\xfc", 1); - ret = rtl2832_sdr_wr_regs(s, 0x00e, "\xfc", 1); - ret = rtl2832_sdr_wr_regs(s, 0x011, "\xd4", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1e5, "\xf0", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1d9, "\x00", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1db, "\x00", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1dd, "\x14", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1de, "\xec", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1d8, "\x0c", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1e6, "\x02", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1d7, "\x09", 1); - ret = rtl2832_sdr_wr_regs(s, 0x00d, "\x83", 1); - ret = rtl2832_sdr_wr_regs(s, 0x010, "\x49", 1); - ret = rtl2832_sdr_wr_regs(s, 0x00d, "\x87", 1); - ret = rtl2832_sdr_wr_regs(s, 0x00d, "\x85", 1); - ret = rtl2832_sdr_wr_regs(s, 0x013, "\x02", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x112, "\x5a", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x102, "\x40", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x103, "\x5a", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1c7, "\x30", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x104, "\xd0", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x105, "\xbe", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1c8, "\x18", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x106, "\x35", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1c9, "\x21", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1ca, "\x21", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1cb, "\x00", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x107, "\x40", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1cd, "\x10", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1ce, "\x10", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x108, "\x80", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x109, "\x7f", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x10a, "\x80", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x10b, "\x7f", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x00e, "\xfc", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x00e, "\xfc", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x011, "\xd4", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1e5, "\xf0", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1d9, "\x00", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1db, "\x00", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1dd, "\x14", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1de, "\xec", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1d8, "\x0c", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1e6, "\x02", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1d7, "\x09", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x00d, "\x83", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x010, "\x49", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x00d, "\x87", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x00d, "\x85", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x013, "\x02", 1); break; case RTL2832_TUNER_FC0012: case RTL2832_TUNER_FC0013: - ret = rtl2832_sdr_wr_regs(s, 0x112, "\x5a", 1); - ret = rtl2832_sdr_wr_regs(s, 0x102, "\x40", 1); - ret = rtl2832_sdr_wr_regs(s, 0x103, "\x5a", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1c7, "\x2c", 1); - ret = rtl2832_sdr_wr_regs(s, 0x104, "\xcc", 1); - ret = rtl2832_sdr_wr_regs(s, 0x105, "\xbe", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1c8, "\x16", 1); - ret = rtl2832_sdr_wr_regs(s, 0x106, "\x35", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1c9, "\x21", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1ca, "\x21", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1cb, "\x00", 1); - ret = rtl2832_sdr_wr_regs(s, 0x107, "\x40", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1cd, "\x10", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1ce, "\x10", 1); - ret = rtl2832_sdr_wr_regs(s, 0x108, "\x80", 1); - ret = rtl2832_sdr_wr_regs(s, 0x109, "\x7f", 1); - ret = rtl2832_sdr_wr_regs(s, 0x10a, "\x80", 1); - ret = rtl2832_sdr_wr_regs(s, 0x10b, "\x7f", 1); - ret = rtl2832_sdr_wr_regs(s, 0x00e, "\xfc", 1); - ret = rtl2832_sdr_wr_regs(s, 0x00e, "\xfc", 1); - ret = rtl2832_sdr_wr_regs(s, 0x011, "\xe9\xbf", 2); - ret = rtl2832_sdr_wr_regs(s, 0x1e5, "\xf0", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1d9, "\x00", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1db, "\x00", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1dd, "\x11", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1de, "\xef", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1d8, "\x0c", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1e6, "\x02", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1d7, "\x09", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x112, "\x5a", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x102, "\x40", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x103, "\x5a", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1c7, "\x2c", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x104, "\xcc", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x105, "\xbe", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1c8, "\x16", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x106, "\x35", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1c9, "\x21", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1ca, "\x21", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1cb, "\x00", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x107, "\x40", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1cd, "\x10", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1ce, "\x10", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x108, "\x80", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x109, "\x7f", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x10a, "\x80", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x10b, "\x7f", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x00e, "\xfc", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x00e, "\xfc", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x011, "\xe9\xbf", 2); + ret = rtl2832_sdr_wr_regs(dev, 0x1e5, "\xf0", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1d9, "\x00", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1db, "\x00", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1dd, "\x11", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1de, "\xef", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1d8, "\x0c", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1e6, "\x02", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1d7, "\x09", 1); break; case RTL2832_TUNER_R820T: - ret = rtl2832_sdr_wr_regs(s, 0x112, "\x5a", 1); - ret = rtl2832_sdr_wr_regs(s, 0x102, "\x40", 1); - ret = rtl2832_sdr_wr_regs(s, 0x115, "\x01", 1); - ret = rtl2832_sdr_wr_regs(s, 0x103, "\x80", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1c7, "\x24", 1); - ret = rtl2832_sdr_wr_regs(s, 0x104, "\xcc", 1); - ret = rtl2832_sdr_wr_regs(s, 0x105, "\xbe", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1c8, "\x14", 1); - ret = rtl2832_sdr_wr_regs(s, 0x106, "\x35", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1c9, "\x21", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1ca, "\x21", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1cb, "\x00", 1); - ret = rtl2832_sdr_wr_regs(s, 0x107, "\x40", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1cd, "\x10", 1); - ret = rtl2832_sdr_wr_regs(s, 0x1ce, "\x10", 1); - ret = rtl2832_sdr_wr_regs(s, 0x108, "\x80", 1); - ret = rtl2832_sdr_wr_regs(s, 0x109, "\x7f", 1); - ret = rtl2832_sdr_wr_regs(s, 0x10a, "\x80", 1); - ret = rtl2832_sdr_wr_regs(s, 0x10b, "\x7f", 1); - ret = rtl2832_sdr_wr_regs(s, 0x00e, "\xfc", 1); - ret = rtl2832_sdr_wr_regs(s, 0x00e, "\xfc", 1); - ret = rtl2832_sdr_wr_regs(s, 0x011, "\xf4", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x112, "\x5a", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x102, "\x40", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x115, "\x01", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x103, "\x80", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1c7, "\x24", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x104, "\xcc", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x105, "\xbe", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1c8, "\x14", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x106, "\x35", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1c9, "\x21", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1ca, "\x21", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1cb, "\x00", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x107, "\x40", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1cd, "\x10", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x1ce, "\x10", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x108, "\x80", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x109, "\x7f", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x10a, "\x80", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x10b, "\x7f", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x00e, "\xfc", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x00e, "\xfc", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x011, "\xf4", 1); break; default: - dev_notice(&s->udev->dev, "Unsupported tuner\n"); + dev_notice(&dev->udev->dev, "Unsupported tuner\n"); } /* software reset */ - ret = rtl2832_sdr_wr_reg_mask(s, 0x101, 0x04, 0x04); + ret = rtl2832_sdr_wr_reg_mask(dev, 0x101, 0x04, 0x04); if (ret) goto err; - ret = rtl2832_sdr_wr_reg_mask(s, 0x101, 0x00, 0x04); + ret = rtl2832_sdr_wr_reg_mask(dev, 0x101, 0x00, 0x04); if (ret) goto err; err: return ret; }; -static void rtl2832_sdr_unset_adc(struct rtl2832_sdr_state *s) +static void rtl2832_sdr_unset_adc(struct rtl2832_sdr_dev *dev) { int ret; - dev_dbg(&s->udev->dev, "\n"); + dev_dbg(&dev->udev->dev, "\n"); /* PID filter */ - ret = rtl2832_sdr_wr_regs(s, 0x061, "\xe0", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x061, "\xe0", 1); if (ret) goto err; /* mode */ - ret = rtl2832_sdr_wr_regs(s, 0x019, "\x20", 1); + ret = rtl2832_sdr_wr_regs(dev, 0x019, "\x20", 1); if (ret) goto err; - ret = rtl2832_sdr_wr_regs(s, 0x017, "\x11\x10", 2); + ret = rtl2832_sdr_wr_regs(dev, 0x017, "\x11\x10", 2); if (ret) goto err; /* FSM */ - ret = rtl2832_sdr_wr_regs(s, 0x192, "\x00\x0f\xff", 3); + ret = rtl2832_sdr_wr_regs(dev, 0x192, "\x00\x0f\xff", 3); if (ret) goto err; - ret = rtl2832_sdr_wr_regs(s, 0x13e, "\x40\x00", 2); + ret = rtl2832_sdr_wr_regs(dev, 0x13e, "\x40\x00", 2); if (ret) goto err; - ret = rtl2832_sdr_wr_regs(s, 0x115, "\x06\x3f\xce\xcc", 4); + ret = rtl2832_sdr_wr_regs(dev, 0x115, "\x06\x3f\xce\xcc", 4); if (ret) goto err; err: return; }; -static int rtl2832_sdr_set_tuner_freq(struct rtl2832_sdr_state *s) +static int rtl2832_sdr_set_tuner_freq(struct rtl2832_sdr_dev *dev) { - struct dvb_frontend *fe = s->fe; + struct dvb_frontend *fe = dev->fe; struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct v4l2_ctrl *bandwidth_auto; struct v4l2_ctrl *bandwidth; @@ -942,29 +942,29 @@ static int rtl2832_sdr_set_tuner_freq(struct rtl2832_sdr_state *s) /* * tuner RF (Hz) */ - if (s->f_tuner == 0) + if (dev->f_tuner == 0) return 0; /* * bandwidth (Hz) */ - bandwidth_auto = v4l2_ctrl_find(&s->hdl, + bandwidth_auto = v4l2_ctrl_find(&dev->hdl, V4L2_CID_RF_TUNER_BANDWIDTH_AUTO); - bandwidth = v4l2_ctrl_find(&s->h |