Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33e553fe authored by Stefan Richter's avatar Stefan Richter
Browse files

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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 56d04cb1

drivers/firewire/core-cdev.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -632,8 +632,7 @@ static void release_request(struct client *client, 




static void handle_request(struct fw_card *card, struct fw_request *request,

static void handle_request(struct fw_card *card, struct fw_request *request,

			   int tcode, int destination, int source,

			   int tcode, int destination, int source,

			   int generation, int speed,

			   int generation, unsigned long long offset,

			   unsigned long long offset,

			   void *payload, size_t length, void *callback_data)

			   void *payload, size_t length, void *callback_data)

{

{

	struct address_handler_resource *handler = callback_data;

	struct address_handler_resource *handler = callback_data;

drivers/firewire/core-transaction.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -802,7 +802,7 @@ static void handle_exclusive_region_request(struct fw_card *card, 
	else

	else

		handler->address_callback(card, request,

		handler->address_callback(card, request,

					  tcode, destination, source,

					  tcode, destination, source,

					  p->generation, p->speed, offset,

					  p->generation, offset,

					  request->data, request->length,

					  request->data, request->length,

					  handler->callback_data);

					  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))

		if (is_enclosing_handler(handler, offset, request->length))

			handler->address_callback(card, NULL, tcode,

			handler->address_callback(card, NULL, tcode,

						  destination, source,

						  destination, source,

						  p->generation, p->speed,

						  p->generation, offset,

						  offset, request->data,

						  request->data,

						  request->length,

						  request->length,

						  handler->callback_data);

						  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,

static void handle_topology_map(struct fw_card *card, struct fw_request *request,

		int tcode, int destination, int source, int generation,

		int tcode, int destination, int source, int generation,

		int speed, unsigned long long offset,

		unsigned long long offset, void *payload, size_t length,

		void *payload, size_t length, void *callback_data)

		void *callback_data)

{

{

	int start;

	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,

static void handle_registers(struct fw_card *card, struct fw_request *request,

		int tcode, int destination, int source, int generation,

		int tcode, int destination, int source, int generation,

		int speed, unsigned long long offset,

		unsigned long long offset, void *payload, size_t length,

		void *payload, size_t length, void *callback_data)

		void *callback_data)

{

{

	int reg = offset & ~CSR_REGISTER_BASE;

	int reg = offset & ~CSR_REGISTER_BASE;

	__be32 *data = payload;

	__be32 *data = payload;

drivers/firewire/net.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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,

static void fwnet_receive_packet(struct fw_card *card, struct fw_request *r,

		int tcode, int destination, int source, int generation,

		int tcode, int destination, int source, int generation,

		int speed, unsigned long long offset, void *payload,

		unsigned long long offset, void *payload, size_t length,

		size_t length, void *callback_data)

		void *callback_data)

{

{

	struct fwnet_device *dev = callback_data;

	struct fwnet_device *dev = callback_data;

	int rcode;

	int rcode;

drivers/firewire/sbp2.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -410,8 +410,7 @@ static void free_orb(struct kref *kref) 




static void sbp2_status_write(struct fw_card *card, struct fw_request *request,

static void sbp2_status_write(struct fw_card *card, struct fw_request *request,

			      int tcode, int destination, int source,

			      int tcode, int destination, int source,

			      int generation, int speed,

			      int generation, unsigned long long offset,

			      unsigned long long offset,

			      void *payload, size_t length, void *callback_data)

			      void *payload, size_t length, void *callback_data)

{

{

	struct sbp2_logical_unit *lu = callback_data;

	struct sbp2_logical_unit *lu = callback_data;

drivers/media/dvb/firewire/firedtv-fw.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -194,8 +194,8 @@ static const struct firedtv_backend backend = { 




static void handle_fcp(struct fw_card *card, struct fw_request *request,

static void handle_fcp(struct fw_card *card, struct fw_request *request,

		       int tcode, int destination, int source, int generation,

		       int tcode, int destination, int source, int generation,

		       int speed, unsigned long long offset,

		       unsigned long long offset, void *payload, size_t length,

		       void *payload, size_t length, void *callback_data)

		       void *callback_data)

{

{

	struct firedtv *f, *fdtv = NULL;

	struct firedtv *f, *fdtv = NULL;

	struct fw_device *device;

	struct fw_device *device;