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

Commit 43286568 authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: fw-ohci: untangle a mixed unsigned/signed expression 



and make another expression more readable.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent ad3c0fe8

drivers/firewire/fw-ohci.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -494,6 +494,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) 
	struct fw_ohci *ohci = ctx->ohci;

	struct fw_ohci *ohci = ctx->ohci;

	struct fw_packet p;

	struct fw_packet p;

	u32 status, length, tcode;

	u32 status, length, tcode;

	int evt;





	p.header[0] = cond_le32_to_cpu(buffer[0]);

	p.header[0] = cond_le32_to_cpu(buffer[0]);

	p.header[1] = cond_le32_to_cpu(buffer[1]);

	p.header[1] = cond_le32_to_cpu(buffer[1]);
@@ -536,13 +537,14 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) 
	/* FIXME: What to do about evt_* errors? */

	/* FIXME: What to do about evt_* errors? */

	length = (p.header_length + p.payload_length + 3) / 4;

	length = (p.header_length + p.payload_length + 3) / 4;

	status = cond_le32_to_cpu(buffer[length]);

	status = cond_le32_to_cpu(buffer[length]);

	evt    = (status >> 16) & 0x1f;





	p.ack        = ((status >> 16) & 0x1f) - 16;

	p.ack        = evt - 16;

	p.speed      = (status >> 21) & 0x7;

	p.speed      = (status >> 21) & 0x7;

	p.timestamp  = status & 0xffff;

	p.timestamp  = status & 0xffff;

	p.generation = ohci->request_generation;

	p.generation = ohci->request_generation;





	log_ar_at_event('R', p.speed, p.header, status >> 16 & 0x1f);

	log_ar_at_event('R', p.speed, p.header, evt);





	/*

	/*

	 * The OHCI bus reset handler synthesizes a phy packet with

	 * The OHCI bus reset handler synthesizes a phy packet with
@@ -554,7 +556,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) 
	 * request.

	 * request.

	 */

	 */





	if (p.ack + 16 == 0x09)

	if (evt == OHCI1394_evt_bus_reset)

		ohci->request_generation = (p.header[2] >> 16) & 0xff;

		ohci->request_generation = (p.header[2] >> 16) & 0xff;

	else if (ctx == &ohci->ar_request_ctx)

	else if (ctx == &ohci->ar_request_ctx)

		fw_core_handle_request(&ohci->card, &p);

		fw_core_handle_request(&ohci->card, &p);