netdev
[Top] [All Lists]

[patch 3/6] sx8 remove duplicate definition msleep(), msecs_to_jiffies()

To: Jeff Garzik <jgarzik@xxxxxxxxx>
Subject: [patch 3/6] sx8 remove duplicate definition msleep(), msecs_to_jiffies()
From: maximilian attems <janitor@xxxxxxxxxxxxxx>
Date: Sun, 31 Oct 2004 15:44:54 +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 msleep(), msecs_to_jiffies().
delay.h already included.

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


---

 linux-2.4.28-rc1-max/drivers/block/sx8.c |   11 -----------
 1 files changed, 11 deletions(-)

diff -puN drivers/block/sx8.c~remove-msleep+msecs_to_jiffies-drivers_block_sx8 
drivers/block/sx8.c
--- 
linux-2.4.28-rc1/drivers/block/sx8.c~remove-msleep+msecs_to_jiffies-drivers_block_sx8
       2004-10-31 13:37:56.000000000 +0100
+++ linux-2.4.28-rc1-max/drivers/block/sx8.c    2004-10-31 13:38:56.000000000 
+0100
@@ -548,17 +548,6 @@ static int carm_bdev_ioctl(struct inode 
        return -EOPNOTSUPP;
 }
 
-static inline unsigned long msecs_to_jiffies(unsigned long msecs)
-{
-       return ((HZ * msecs + 999) / 1000);
-}
-
-static void msleep(unsigned long msecs)
-{
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(msecs_to_jiffies(msecs) + 1);
-}
-
 static const u32 msg_sizes[] = { 32, 64, 128, CARM_MSG_SIZE };
 
 static inline int carm_lookup_bucket(u32 msg_size)
_


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