Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[sfrench/cifs-2.6.git] / drivers / staging / cx25821 / cx25821-audio-upstream.c

diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c
index eb39d13f7d75afe40a20610f9ae152770a71137b..cdff49f409f25f4161ee30fea5bd535eaddb2a71 100644 (file)
--- a/drivers/staging/cx25821/cx25821-audio-upstream.c
+++ b/drivers/staging/cx25821/cx25821-audio-upstream.c
@@ -106,7 +106,7 @@ static __le32 *cx25821_risc_field_upstream_audio(struct cx25821_dev *dev,
 {
        unsigned int line;
        struct sram_channel *sram_ch =
-           &dev->sram_channels[dev->_audio_upstream_channel_select];
+          dev->channels[dev->_audio_upstream_channel_select].sram_channels;
        int offset = 0;
 
        /* scan lines */
@@ -217,7 +217,7 @@ void cx25821_free_memory_audio(struct cx25821_dev *dev)
 void cx25821_stop_upstream_audio(struct cx25821_dev *dev)
 {
        struct sram_channel *sram_ch =
-           &dev->sram_channels[AUDIO_UPSTREAM_SRAM_CHANNEL_B];
+          dev->channels[AUDIO_UPSTREAM_SRAM_CHANNEL_B].sram_channels;
        u32 tmp = 0;
 
        if (!dev->_audio_is_running) {
@@ -287,14 +287,14 @@ int cx25821_get_audio_data(struct cx25821_dev *dev,
                return PTR_ERR(myfile);
        } else {
                if (!(myfile->f_op)) {
-                       printk("%s: File has no file operations registered!\n",
+                       printk(KERN_ERR "%s: File has no file operations registered!\n",
                               __func__);
                        filp_close(myfile, NULL);
                        return -EIO;
                }
 
                if (!myfile->f_op->read) {
-                       printk("%s: File has no READ operations registered!\n",
+                       printk(KERN_ERR "%s: File has no READ operations registered!\n",
                               __func__);
                        filp_close(myfile, NULL);
                        return -EIO;
@@ -353,8 +353,9 @@ static void cx25821_audioups_handler(struct work_struct *work)
        }
 
        cx25821_get_audio_data(dev,
-                              &dev->sram_channels[dev->
-                                                  _audio_upstream_channel_select]);
+                             dev->channels[dev->
+                                      _audio_upstream_channel_select].
+                                      sram_channels);
 }
 
 int cx25821_openfile_audio(struct cx25821_dev *dev,
@@ -378,14 +379,14 @@ int cx25821_openfile_audio(struct cx25821_dev *dev,
                return PTR_ERR(myfile);
        } else {
                if (!(myfile->f_op)) {
-                       printk("%s: File has no file operations registered!\n",
+                       printk(KERN_ERR "%s: File has no file operations registered!\n",
                               __func__);
                        filp_close(myfile, NULL);
                        return -EIO;
                }
 
                if (!myfile->f_op->read) {
-                       printk("%s: File has no READ operations registered!\n",
+                       printk(KERN_ERR "%s: File has no READ operations registered!\n",
                               __func__);
                        filp_close(myfile, NULL);
                        return -EIO;
@@ -505,7 +506,7 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,
 {
        int i = 0;
        u32 int_msk_tmp;
-       struct sram_channel *channel = &dev->sram_channels[chan_num];
+       struct sram_channel *channel = dev->channels[chan_num].sram_channels;
        dma_addr_t risc_phys_jump_addr;
        __le32 *rp;
 
@@ -569,15 +570,15 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,
                spin_unlock(&dev->slock);
        } else {
                if (status & FLD_AUD_SRC_OF)
-                       printk("%s: Audio Received Overflow Error Interrupt!\n",
+                       printk(KERN_WARNING "%s: Audio Received Overflow Error Interrupt!\n",
                               __func__);
 
                if (status & FLD_AUD_SRC_SYNC)
-                       printk("%s: Audio Received Sync Error Interrupt!\n",
+                       printk(KERN_WARNING "%s: Audio Received Sync Error Interrupt!\n",
                               __func__);
 
                if (status & FLD_AUD_SRC_OPC_ERR)
-                       printk("%s: Audio Received OpCode Error Interrupt!\n",
+                       printk(KERN_WARNING "%s: Audio Received OpCode Error Interrupt!\n",
                               __func__);
 
                /* Read and write back the interrupt status register to clear
@@ -586,7 +587,7 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,
        }
 
        if (dev->_audiofile_status == END_OF_FILE) {
-               printk("cx25821: EOF Channel Audio Framecount = %d\n",
+               printk(KERN_WARNING "cx25821: EOF Channel Audio Framecount = %d\n",
                       dev->_audioframe_count);
                return -1;
        }
@@ -607,7 +608,8 @@ static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id)
        if (!dev)
                return -1;
 
-       sram_ch = &dev->sram_channels[dev->_audio_upstream_channel_select];
+       sram_ch = dev->channels[dev->_audio_upstream_channel_select].
+                                      sram_channels;
 
        msk_stat = cx_read(sram_ch->int_mstat);
        audio_status = cx_read(sram_ch->int_stat);
@@ -644,8 +646,8 @@ static void cx25821_wait_fifo_enable(struct cx25821_dev *dev,
 
                /* 10 millisecond timeout */
                if (count++ > 1000) {
-                       printk
-                           ("cx25821 ERROR: %s() fifo is NOT turned on. Timeout!\n",
+                       printk(KERN_ERR
+                              "cx25821 ERROR: %s() fifo is NOT turned on. Timeout!\n",
                             __func__);
                        return;
                }
@@ -726,12 +728,12 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
        int str_length = 0;
 
        if (dev->_audio_is_running) {
-               printk("Audio Channel is still running so return!\n");
+               printk(KERN_WARNING "Audio Channel is still running so return!\n");
                return 0;
        }
 
        dev->_audio_upstream_channel_select = channel_select;
-       sram_ch = &dev->sram_channels[channel_select];
+       sram_ch = dev->channels[channel_select].sram_channels;
 
        /* Work queue */
        INIT_WORK(&dev->_audio_work_entry, cx25821_audioups_handler);