From: Peter Hurley <peter@hurleysoftware.com>
Date: Tue, 29 Jan 2013 01:57:47 +0000 (-0500)
Subject: staging/fwserial: Fold constant MAX_ASYNC_PAYLOAD
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3b1f315415d3e9b2648bec82c0c1cd9eff2d8743;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

staging/fwserial: Fold constant MAX_ASYNC_PAYLOAD

Since peer->max_payload is now limited to 1394-2008 spec maximum
of 4096, the port->max_payload limit can now be simplified.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
index 5f5474376fc4..815c01119583 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -1683,8 +1683,7 @@ static void fwserial_virt_plug_complete(struct fwtty_peer *peer,
 
 	/* reconfigure tx_fifo optimally for this peer */
 	spin_lock_bh(&port->lock);
-	port->max_payload = min3(peer->max_payload, peer->fifo_len,
-				 MAX_ASYNC_PAYLOAD);
+	port->max_payload = min(peer->max_payload, peer->fifo_len);
 	dma_fifo_change_tx_limit(&port->tx_fifo, port->max_payload);
 	spin_unlock_bh(&peer->port->lock);