1 files changed, 21 insertions, 23 deletions

diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index 3468419259a0..f1ebb7b468cf 100644
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -447,17 +447,18 @@ static int handle_out_packet(struct amdtp_stream *s, unsigned int data_blocks,
 }
 
 static int handle_in_packet(struct amdtp_stream *s,
-                            unsigned int payload_quadlets, __be32 *buffer,
-                            unsigned int *data_blocks, unsigned int cycle,
-                            unsigned int syt)
+                            unsigned int payload_quadlets, unsigned int cycle)
 {
+        __be32 *buffer;
         u32 cip_header[2];
-        unsigned int fmt, fdf;
+        unsigned int fmt, fdf, syt;
         unsigned int data_block_quadlets, data_block_counter, dbc_interval;
+        unsigned int data_blocks;
         struct snd_pcm_substream *pcm;
         unsigned int pcm_frames;
         bool lost;
 
+        buffer = s->buffer.packets[s->packet_index].buffer;
         cip_header[0] = be32_to_cpu(buffer[0]);
         cip_header[1] = be32_to_cpu(buffer[1]);
 
@@ -472,7 +473,7 @@ static int handle_in_packet(struct amdtp_stream *s,
                 dev_info_ratelimited(&s->unit->device,
                                 "Invalid CIP header for AMDTP: %08X:%08X\n",
                                 cip_header[0], cip_header[1]);
-                *data_blocks = 0;
+                data_blocks = 0;
                 pcm_frames = 0;
                 goto end;
         }
@@ -483,7 +484,7 @@ static int handle_in_packet(struct amdtp_stream *s,
                 dev_info_ratelimited(&s->unit->device,
                                      "Detect unexpected protocol: %08x %08x\n",
                                      cip_header[0], cip_header[1]);
-                *data_blocks = 0;
+                data_blocks = 0;
                 pcm_frames = 0;
                 goto end;
         }
@@ -492,7 +493,7 @@ static int handle_in_packet(struct amdtp_stream *s,
         fdf = (cip_header[1] & CIP_FDF_MASK) >> CIP_FDF_SHIFT;
         if (payload_quadlets < 3 ||
             (fmt == CIP_FMT_AM && fdf == AMDTP_FDF_NO_DATA)) {
-                *data_blocks = 0;
+                data_blocks = 0;
         } else {
                 data_block_quadlets =
                         (cip_header[0] & CIP_DBS_MASK) >> CIP_DBS_SHIFT;
@@ -506,12 +507,12 @@ static int handle_in_packet(struct amdtp_stream *s,
                 if (s->flags & CIP_WRONG_DBS)
                         data_block_quadlets = s->data_block_quadlets;
 
-                *data_blocks = (payload_quadlets - 2) / data_block_quadlets;
+                data_blocks = (payload_quadlets - 2) / data_block_quadlets;
         }
 
         /* Check data block counter continuity */
         data_block_counter = cip_header[0] & CIP_DBC_MASK;
-        if (*data_blocks == 0 && (s->flags & CIP_EMPTY_HAS_WRONG_DBC) &&
+        if (data_blocks == 0 && (s->flags & CIP_EMPTY_HAS_WRONG_DBC) &&
             s->data_block_counter != UINT_MAX)
                 data_block_counter = s->data_block_counter;
 
@@ -522,10 +523,10 @@ static int handle_in_packet(struct amdtp_stream *s,
         } else if (!(s->flags & CIP_DBC_IS_END_EVENT)) {
                 lost = data_block_counter != s->data_block_counter;
         } else {
-                if ((*data_blocks > 0) && (s->tx_dbc_interval > 0))
+                if (data_blocks > 0 && s->tx_dbc_interval > 0)
                         dbc_interval = s->tx_dbc_interval;
                 else
-                        dbc_interval = *data_blocks;
+                        dbc_interval = data_blocks;
 
                 lost = data_block_counter !=
                        ((s->data_block_counter + dbc_interval) & 0xff);
@@ -538,13 +539,14 @@ static int handle_in_packet(struct amdtp_stream *s,
                 return -EIO;
         }
 
-        pcm_frames = s->process_data_blocks(s, buffer + 2, *data_blocks, &syt);
+        syt = be32_to_cpu(buffer[1]) & CIP_SYT_MASK;
+        pcm_frames = s->process_data_blocks(s, buffer + 2, data_blocks, &syt);
 
         if (s->flags & CIP_DBC_IS_END_EVENT)
                 s->data_block_counter = data_block_counter;
         else
                 s->data_block_counter =
-                                (data_block_counter + *data_blocks) & 0xff;
+                                (data_block_counter + data_blocks) & 0xff;
 end:
         if (queue_in_packet(s) < 0)
                 return -EIO;
@@ -618,10 +620,9 @@ static void in_stream_callback(struct fw_iso_context *context, u32 tstamp,
                                void *private_data)
 {
         struct amdtp_stream *s = private_data;
-        unsigned int p, syt, packets;
+        unsigned int i, packets;
         unsigned int payload_quadlets, max_payload_quadlets;
-        unsigned int data_blocks;
-        __be32 *buffer, *headers = header;
+        __be32 *headers = header;
         u32 cycle;
 
         if (s->packet_index < 0)
@@ -638,13 +639,12 @@ static void in_stream_callback(struct fw_iso_context *context, u32 tstamp,
         /* For buffer-over-run prevention. */
         max_payload_quadlets = amdtp_stream_get_max_payload(s) / 4;
 
-        for (p = 0; p < packets; p++) {
+        for (i = 0; i < packets; i++) {
                 cycle = increment_cycle_count(cycle, 1);
-                buffer = s->buffer.packets[s->packet_index].buffer;
 
                 /* The number of quadlets in this packet */
                 payload_quadlets =
-                        (be32_to_cpu(headers[p]) >> ISO_DATA_LENGTH_SHIFT) / 4;
+                        (be32_to_cpu(headers[i]) >> ISO_DATA_LENGTH_SHIFT) / 4;
                 if (payload_quadlets > max_payload_quadlets) {
                         dev_err(&s->unit->device,
                                 "Detect jumbo payload: %02x %02x\n",
@@ -652,14 +652,12 @@ static void in_stream_callback(struct fw_iso_context *context, u32 tstamp,
                         break;
                 }
 
-                syt = be32_to_cpu(buffer[1]) & CIP_SYT_MASK;
-                if (handle_in_packet(s, payload_quadlets, buffer,
-                                                &data_blocks, cycle, syt) < 0)
+                if (handle_in_packet(s, payload_quadlets, cycle) < 0)
                         break;
         }
 
         /* Queueing error or detecting invalid payload. */
-        if (p < packets) {
+        if (i < packets) {
                 s->packet_index = -1;
                 amdtp_stream_pcm_abort(s);
                 return;