Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a38a00fdef98a8eda23a25e54490b32865bc7c33

Authored by Stefan Richter
1 parent 18e9b10fcd
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

firewire: core: drop unused call parameters of close_transaction 

All callers inserted NULL and 0 here.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

Showing 1 changed file with 8 additions and 9 deletions Side-by-side Diff

drivers/firewire/fw-transaction.c
Diff comments   View file @ a38a00f
... ... @@ -65,8 +65,7 @@
65 65 #define PHY_IDENTIFIER(id) ((id) << 30)
66 66  
67 67 static int close_transaction(struct fw_transaction *transaction,
68   - struct fw_card *card, int rcode,
69   - u32 *payload, size_t length)
  68 + struct fw_card *card, int rcode)
70 69 {
71 70 struct fw_transaction *t;
72 71 unsigned long flags;
... ... @@ -82,7 +81,7 @@
82 81 spin_unlock_irqrestore(&card->lock, flags);
83 82  
84 83 if (&t->link != &card->transaction_list) {
85   - t->callback(card, rcode, payload, length, t->callback_data);
  84 + t->callback(card, rcode, NULL, 0, t->callback_data);
86 85 return 0;
87 86 }
88 87  
... ... @@ -110,7 +109,7 @@
110 109 * if the transaction is still pending and remove it in that case.
111 110 */
112 111  
113   - return close_transaction(transaction, card, RCODE_CANCELLED, NULL, 0);
  112 + return close_transaction(transaction, card, RCODE_CANCELLED);
114 113 }
115 114 EXPORT_SYMBOL(fw_cancel_transaction);
116 115  
... ... @@ -122,7 +121,7 @@
122 121  
123 122 switch (status) {
124 123 case ACK_COMPLETE:
125   - close_transaction(t, card, RCODE_COMPLETE, NULL, 0);
  124 + close_transaction(t, card, RCODE_COMPLETE);
126 125 break;
127 126 case ACK_PENDING:
128 127 t->timestamp = packet->timestamp;
129 128  
130 129  
131 130  
... ... @@ -130,20 +129,20 @@
130 129 case ACK_BUSY_X:
131 130 case ACK_BUSY_A:
132 131 case ACK_BUSY_B:
133   - close_transaction(t, card, RCODE_BUSY, NULL, 0);
  132 + close_transaction(t, card, RCODE_BUSY);
134 133 break;
135 134 case ACK_DATA_ERROR:
136   - close_transaction(t, card, RCODE_DATA_ERROR, NULL, 0);
  135 + close_transaction(t, card, RCODE_DATA_ERROR);
137 136 break;
138 137 case ACK_TYPE_ERROR:
139   - close_transaction(t, card, RCODE_TYPE_ERROR, NULL, 0);
  138 + close_transaction(t, card, RCODE_TYPE_ERROR);
140 139 break;
141 140 default:
142 141 /*
143 142 * In this case the ack is really a juju specific
144 143 * rcode, so just forward that to the callback.
145 144 */
146   - close_transaction(t, card, status, NULL, 0);
  145 + close_transaction(t, card, status);
147 146 break;
148 147 }
149 148 }