LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Harvey Harrison <harvey.harrison@gmail.com>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Jeff Garzik <jeff@garzik.org>, Tejun Heo <htejun@gmail.com>,
	LKML <linux-kernel@vger.kernel.org>,
	linux-ide <linux-ide@vger.kernel.org>
Subject: [PATCH 05/11v2] ata: replace macro with static inline in libata.h
Date: Thu, 14 Feb 2008 10:11:37 -0800	[thread overview]
Message-ID: <1203012697.2748.55.camel@brick> (raw)
In-Reply-To: <20080214120101.150a3284@core>

Instead of using min/max_t(short... use a static inline to get
typechecking.

As a bonus, avoid a metric ton of sparse warnings like:
drivers/ata/pata_ali.c:176:14: warning: symbol '__x' shadows an earlier one
drivers/ata/pata_ali.c:176:14: originally declared here

Due to nesting min_t macro inside max_t macro which both use a __x
identifier internally.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
Alan, is this more to your liking?

 include/linux/libata.h |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/include/linux/libata.h b/include/linux/libata.h
index bc5a8d0..b5590fb 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -764,7 +764,14 @@ struct ata_timing {
 	unsigned short udma;		/* t2CYCTYP/2 */
 };
 
-#define FIT(v, vmin, vmax)	max_t(short, min_t(short, v, vmax), vmin)
+static inline short FIT(short v, short vmin, short vmax)
+{
+	if (v >= vmax)
+		return vmax;
+	if (v <= vmin)
+		return vmin;
+	return v;
+}
 
 extern const unsigned long sata_deb_timing_normal[];
 extern const unsigned long sata_deb_timing_hotplug[];
-- 
1.5.4.1.1278.gc75be




  parent reply	other threads:[~2008-02-14 18:11 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <3ad7c41048d88a3f8aad098570b9fac9ff719aff.1202965399.git.harvey.harrison@gmail.com>
2008-02-14  5:14 ` [PATCH 02/11] ata: fix sparse warning in sata_promise.c Harvey Harrison
2008-02-14  5:14 ` [PATCH 03/11] ata: fix sparse warning in sata_via.c Harvey Harrison
2008-02-14  5:14 ` [PATCH 04/11] ata: fix sparse warnings in sata_mv.c Harvey Harrison
2008-02-14  5:14 ` [PATCH 05/11] ata: replace macro with static inline in libata.h Harvey Harrison
2008-02-14 12:01   ` Alan Cox
2008-02-14 17:38     ` Harvey Harrison
2008-02-14 18:11     ` Harvey Harrison [this message]
2008-02-14  5:14 ` [PATCH 06/11] ata: sparse fixes for pata_amd.c Harvey Harrison
2008-02-15 18:52   ` Jeff Garzik
2008-02-14  5:14 ` [PATCH 07/11] ata: fix sparse warning in pata_cs5536.c Harvey Harrison
2008-02-14  5:14 ` [PATCH 08/11] ata: fix sparse warning in pata_jmicron.c Harvey Harrison
2008-02-14  5:14 ` [PATCH 09/11] ata: fix sparse warning in pata_marvell.c Harvey Harrison
2008-02-15 14:29   ` Jan Engelhardt
2008-02-14  5:14 ` [PATCH 10/11] ata: fix sparse warning in pata_acpi.c Harvey Harrison
2008-02-14  5:14 ` [PATCH 11/11] ata: fix sparse warnings in pata_legacy.c Harvey Harrison
2008-02-14 12:02   ` Alan Cox
2008-02-14 17:36     ` [PATCH 11/11v2] " Harvey Harrison
2008-02-14 17:56       ` Alan Cox
2008-02-20 17:09       ` Jeff Garzik

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=1203012697.2748.55.camel@brick \
    --to=harvey.harrison@gmail.com \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=htejun@gmail.com \
    --cc=jeff@garzik.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH 05/11v2] ata: replace macro with static inline in libata.h' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).