Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 33e553fe2b4a983ef34a57ab1440d8d33397bb12

Authored by Stefan Richter
1 parent 56d04cb189
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: remove an unused function argument 

void (*fw_address_callback_t)(..., int speed, ...) is the speed that a
remote node chose to transmit a request to us.  In case of split
transactions, firewire-core will transmit the response at that speed.

Upper layer drivers on the other hand (firewire-net, -sbp2, firedtv, and
userspace drivers) cannot do anything useful with that speed datum,
except log it for debug purposes.  But data that is merely potentially
(not even actually) used for debug purposes does not belong into the API.

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

Showing 6 changed files with 14 additions and 16 deletions Side-by-side Diff

drivers/firewire/core-cdev.c
Diff comments   View file @ 33e553f
... ... @@ -632,8 +632,7 @@
632 632  
633 633 static void handle_request(struct fw_card *card, struct fw_request *request,
634 634 int tcode, int destination, int source,
635   - int generation, int speed,
636   - unsigned long long offset,
  635 + int generation, unsigned long long offset,
637 636 void *payload, size_t length, void *callback_data)
638 637 {
639 638 struct address_handler_resource *handler = callback_data;
drivers/firewire/core-transaction.c
Diff comments   View file @ 33e553f
... ... @@ -802,7 +802,7 @@
802 802 else
803 803 handler->address_callback(card, request,
804 804 tcode, destination, source,
805   - p->generation, p->speed, offset,
  805 + p->generation, offset,
806 806 request->data, request->length,
807 807 handler->callback_data);
808 808 }
... ... @@ -840,8 +840,8 @@
840 840 if (is_enclosing_handler(handler, offset, request->length))
841 841 handler->address_callback(card, NULL, tcode,
842 842 destination, source,
843   - p->generation, p->speed,
844   - offset, request->data,
  843 + p->generation, offset,
  844 + request->data,
845 845 request->length,
846 846 handler->callback_data);
847 847 }
... ... @@ -951,8 +951,8 @@
951 951  
952 952 static void handle_topology_map(struct fw_card *card, struct fw_request *request,
953 953 int tcode, int destination, int source, int generation,
954   - int speed, unsigned long long offset,
955   - void *payload, size_t length, void *callback_data)
  954 + unsigned long long offset, void *payload, size_t length,
  955 + void *callback_data)
956 956 {
957 957 int start;
958 958  
... ... @@ -996,8 +996,8 @@
996 996  
997 997 static void handle_registers(struct fw_card *card, struct fw_request *request,
998 998 int tcode, int destination, int source, int generation,
999   - int speed, unsigned long long offset,
1000   - void *payload, size_t length, void *callback_data)
  999 + unsigned long long offset, void *payload, size_t length,
  1000 + void *callback_data)
1001 1001 {
1002 1002 int reg = offset & ~CSR_REGISTER_BASE;
1003 1003 __be32 *data = payload;
drivers/firewire/net.c
Diff comments   View file @ 33e553f
... ... @@ -805,8 +805,8 @@
805 805  
806 806 static void fwnet_receive_packet(struct fw_card *card, struct fw_request *r,
807 807 int tcode, int destination, int source, int generation,
808   - int speed, unsigned long long offset, void *payload,
809   - size_t length, void *callback_data)
  808 + unsigned long long offset, void *payload, size_t length,
  809 + void *callback_data)
810 810 {
811 811 struct fwnet_device *dev = callback_data;
812 812 int rcode;
drivers/firewire/sbp2.c
Diff comments   View file @ 33e553f
... ... @@ -410,8 +410,7 @@
410 410  
411 411 static void sbp2_status_write(struct fw_card *card, struct fw_request *request,
412 412 int tcode, int destination, int source,
413   - int generation, int speed,
414   - unsigned long long offset,
  413 + int generation, unsigned long long offset,
415 414 void *payload, size_t length, void *callback_data)
416 415 {
417 416 struct sbp2_logical_unit *lu = callback_data;
drivers/media/dvb/firewire/firedtv-fw.c
Diff comments   View file @ 33e553f
... ... @@ -194,8 +194,8 @@
194 194  
195 195 static void handle_fcp(struct fw_card *card, struct fw_request *request,
196 196 int tcode, int destination, int source, int generation,
197   - int speed, unsigned long long offset,
198   - void *payload, size_t length, void *callback_data)
  197 + unsigned long long offset, void *payload, size_t length,
  198 + void *callback_data)
199 199 {
200 200 struct firedtv *f, *fdtv = NULL;
201 201 struct fw_device *device;
include/linux/firewire.h
Diff comments   View file @ 33e553f
... ... @@ -265,7 +265,7 @@
265 265 typedef void (*fw_address_callback_t)(struct fw_card *card,
266 266 struct fw_request *request,
267 267 int tcode, int destination, int source,
268   - int generation, int speed,
  268 + int generation,
269 269 unsigned long long offset,
270 270 void *data, size_t length,
271 271 void *callback_data);