netdev
[Top] [All Lists]

[patch 2/6] libata remove duplicate definition msecs_to_jiffies()

To: Jeff Garzik <jgarzik@xxxxxxxxx>
Subject: [patch 2/6] libata remove duplicate definition msecs_to_jiffies()
From: maximilian attems <janitor@xxxxxxxxxxxxxx>
Date: Sun, 31 Oct 2004 15:44:42 +0100
Cc: Margit Schubert-While <margitsw@xxxxxxxxxxx>, Nishanth Aravamudan <nacc@xxxxxxxxxx>, hvr@xxxxxxx, mcgrof@xxxxxxxxxxxxxxxxxxxx, kernel-janitors@xxxxxxxxxxxxxx, netdev@xxxxxxxxxxx, Domen Puncer <domen@xxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx
In-reply-to: <41841886.2080609@xxxxxxxxx>
Mail-followup-to: Jeff Garzik <jgarzik@xxxxxxxxx>, Margit Schubert-While <margitsw@xxxxxxxxxxx>, Nishanth Aravamudan <nacc@xxxxxxxxxx>, hvr@xxxxxxx, mcgrof@xxxxxxxxxxxxxxxxxxxx, kernel-janitors@xxxxxxxxxxxxxx, netdev@xxxxxxxxxxx, Domen Puncer <domen@xxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx
References: <20040923221303.GB13244@xxxxxxxxxx> <20040923221303.GB13244@xxxxxxxxxx> <5.1.0.14.2.20040924074745.00b1cd40@xxxxxxxxxxxxxxx> <415CD9D9.2000607@xxxxxxxxx> <20041030222228.GB1456@xxxxxxx> <41841886.2080609@xxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mutt/1.5.6+20040722i

remove duplicate definition of msecs_to_jiffies().
already includes delay.h

Signed-off-by: Maximilian Attems <janitor@xxxxxxxxxxxxxx>


---

 linux-2.4.28-rc1-max/include/linux/libata.h |    5 -----
 1 files changed, 5 deletions(-)

diff -puN include/linux/libata.h~remove-msecs_to_jiffies-libata.h 
include/linux/libata.h
--- linux-2.4.28-rc1/include/linux/libata.h~remove-msecs_to_jiffies-libata.h    
2004-10-31 13:33:52.000000000 +0100
+++ linux-2.4.28-rc1-max/include/linux/libata.h 2004-10-31 13:36:16.000000000 
+0100
@@ -419,11 +419,6 @@ extern int ata_std_bios_param(Disk * dis
 extern void libata_msleep(unsigned long msecs);
 
 
-static inline unsigned long msecs_to_jiffies(unsigned long msecs)
-{
-       return ((HZ * msecs + 999) / 1000);
-}
-
 static inline unsigned int ata_tag_valid(unsigned int tag)
 {
        return (tag < ATA_MAX_QUEUE) ? 1 : 0;
_

<Prev in Thread] Current Thread [Next in Thread>