The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Richard Knutsson <ricknu-0@student.ltu.se>
To: linux-pcmcia@lists.infradead.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
	Richard Knutsson <ricknu-0@student.ltu.se>
Subject: [PATCH 4/6] pcmcia/axnet_cs: Make use of 'max()' instead of handcrafted one
Date: Tue, 11 Dec 2007 05:32:54 +0100 (MET)	[thread overview]
Message-ID: <20071211043428.28518.24891.sendpatchset@thinktank.campus.ltu.se> (raw)
In-Reply-To: <20071211043412.28518.40867.sendpatchset@thinktank.campus.ltu.se>

Use 'max(x,y)' instead of 'x < y ? y : x'.

Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
---


diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 8d910a3..96931cc 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1091,8 +1091,8 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	
 	ei_local->irqlock = 1;
 
-	send_length = ETH_ZLEN < length ? length : ETH_ZLEN;
-	
+	send_length = max(length, ETH_ZLEN);
+
 	/*
 	 * We have two Tx slots available for use. Find the first free
 	 * slot, and then perform some sanity checks. With two Tx bufs,

  parent reply	other threads:[~2007-12-11  4:33 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-11  4:32 [PATCH 1/6] pcmcia/3c574_cs: Fix dubious bitfield warning Richard Knutsson
2007-12-11  4:32 ` [PATCH 2/6] pcmcia/3c574_cs: Fix 'shadow variable' warning Richard Knutsson
2007-12-11 13:22   ` Alan Cox
2007-12-11  4:32 ` [PATCH 3/6] pcmcia/axnet_cs: Make functions static Richard Knutsson
2007-12-11  4:32 ` Richard Knutsson [this message]
2007-12-11  4:32 ` [PATCH 5/6] pcmcia/fmvj18x_cs: Fix 'shadow variable' warning Richard Knutsson
2007-12-11  4:33 ` [PATCH 6/6] pcmcia/pcnet_cs: " Richard Knutsson
2007-12-11 13:19 ` [PATCH 1/6] pcmcia/3c574_cs: Fix dubious bitfield warning Alan Cox
2007-12-12  1:40   ` Richard Knutsson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071211043428.28518.24891.sendpatchset@thinktank.campus.ltu.se \
    --to=ricknu-0@student.ltu.se \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pcmcia@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox