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 <[email protected]>

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index ca72cdaa68c9ea1d9a4f1e8fa0626761407a0797..4e0478d70d4d2959277c07efd86917304ad8a592 100644 (file)
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -632,8 +632,7 @@ static void release_request(struct client *client,
 
 static void handle_request(struct fw_card *card, struct fw_request *request,
                           int tcode, int destination, int source,
-                          int generation, int speed,
-                          unsigned long long offset,
+                          int generation, unsigned long long offset,
                           void *payload, size_t length, void *callback_data)
 {
        struct address_handler_resource *handler = callback_data;

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index cb6390fe36863b0c781b2feaa8f97531c4f93b1d..2f67c8d5ce91cbe5d4047619d8ec4ca381124ace 100644 (file)
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -802,7 +802,7 @@ static void handle_exclusive_region_request(struct fw_card *card,
        else
                handler->address_callback(card, request,
                                          tcode, destination, source,
-                                         p->generation, p->speed, offset,
+                                         p->generation, offset,
                                          request->data, request->length,
                                          handler->callback_data);
 }
@@ -840,8 +840,8 @@ static void handle_fcp_region_request(struct fw_card *card,
                if (is_enclosing_handler(handler, offset, request->length))
                        handler->address_callback(card, NULL, tcode,
                                                  destination, source,
-                                                 p->generation, p->speed,
-                                                 offset, request->data,
+                                                 p->generation, offset,
+                                                 request->data,
                                                  request->length,
                                                  handler->callback_data);
        }
@@ -951,8 +951,8 @@ static const struct fw_address_region topology_map_region =
 
 static void handle_topology_map(struct fw_card *card, struct fw_request *request,
                int tcode, int destination, int source, int generation,
-               int speed, unsigned long long offset,
-               void *payload, size_t length, void *callback_data)
+               unsigned long long offset, void *payload, size_t length,
+               void *callback_data)
 {
        int start;
 
@@ -996,8 +996,8 @@ static void update_split_timeout(struct fw_card *card)
 
 static void handle_registers(struct fw_card *card, struct fw_request *request,
                int tcode, int destination, int source, int generation,
-               int speed, unsigned long long offset,
-               void *payload, size_t length, void *callback_data)
+               unsigned long long offset, void *payload, size_t length,
+               void *callback_data)
 {
        int reg = offset & ~CSR_REGISTER_BASE;
        __be32 *data = payload;

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 2d3dc7ded0a94d88fd80e8506685e755ce09113e..4bb3fb882f632d79391e25b881b2420493cb5caa 100644 (file)
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -805,8 +805,8 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
 
 static void fwnet_receive_packet(struct fw_card *card, struct fw_request *r,
                int tcode, int destination, int source, int generation,
-               int speed, unsigned long long offset, void *payload,
-               size_t length, void *callback_data)
+               unsigned long long offset, void *payload, size_t length,
+               void *callback_data)
 {
        struct fwnet_device *dev = callback_data;
        int rcode;

diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index ae715c82da2e3658db62a480c2ae27f791b3b5a2..1931964c4fbf93e2aaddc19c67d8e93de8603c38 100644 (file)
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@ -410,8 +410,7 @@ static void free_orb(struct kref *kref)
 
 static void sbp2_status_write(struct fw_card *card, struct fw_request *request,
                              int tcode, int destination, int source,
-                             int generation, int speed,
-                             unsigned long long offset,
+                             int generation, unsigned long long offset,
                              void *payload, size_t length, void *callback_data)
 {
        struct sbp2_logical_unit *lu = callback_data;

diff --git a/drivers/media/dvb/firewire/firedtv-fw.c b/drivers/media/dvb/firewire/firedtv-fw.c
index 4253b7ab00970ec84a97a10e317757d6c3eea0c5..4dcae63f8cff969756cad96fec5d436d349e069d 100644 (file)
--- a/drivers/media/dvb/firewire/firedtv-fw.c
+++ b/drivers/media/dvb/firewire/firedtv-fw.c
@@ -194,8 +194,8 @@ static const struct firedtv_backend backend = {
 
 static void handle_fcp(struct fw_card *card, struct fw_request *request,
                       int tcode, int destination, int source, int generation,
-                      int speed, unsigned long long offset,
-                      void *payload, size_t length, void *callback_data)
+                      unsigned long long offset, void *payload, size_t length,
+                      void *callback_data)
 {
        struct firedtv *f, *fdtv = NULL;
        struct fw_device *device;

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 5553018d45d68f23c94846d19039339a0496ae61..e44b502c83418b662cfe8a1ec487ebc739343878 100644 (file)
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -265,7 +265,7 @@ typedef void (*fw_transaction_callback_t)(struct fw_card *card, int rcode,
 typedef void (*fw_address_callback_t)(struct fw_card *card,
                                      struct fw_request *request,
                                      int tcode, int destination, int source,
-                                     int generation, int speed,
+                                     int generation,
                                      unsigned long long offset,
                                      void *data, size_t length,
                                      void *callback_data);