Skip to content

Commit

Permalink
firewire: remove an unused function argument
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stefan Richter committed Jun 20, 2010
1 parent 56d04cb commit 33e553f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 16 deletions.
3 changes: 1 addition & 2 deletions drivers/firewire/core-cdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions drivers/firewire/core-transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/firewire/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions drivers/firewire/sbp2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/dvb/firewire/firedtv-fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion include/linux/firewire.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 33e553f

Please sign in to comment.