diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2010-04-12 21:11:41 +0900 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2010-05-14 17:08:02 -0400 |
| commit | 9990b6f32b5d35e76b4c2a0dd9469f96350c4d9d (patch) | |
| tree | d2fa24d5218f4212768091f88d4517d5edb72911 /drivers/ata/libata-core.c | |
| parent | b48d58f55aa1d2d0d12378e45663842d4021916e (diff) | |
| download | op-kernel-dev-9990b6f32b5d35e76b4c2a0dd9469f96350c4d9d.zip op-kernel-dev-9990b6f32b5d35e76b4c2a0dd9469f96350c4d9d.tar.gz | |
libata: use __ratelimit
Use __ratelimit() instead of its own private rate limit implementation.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: linux-ide@vger.kernel.org
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 134b5df..86f405b 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -65,6 +65,7 @@ #include <linux/libata.h> #include <asm/byteorder.h> #include <linux/cdrom.h> +#include <linux/ratelimit.h> #include "libata.h" @@ -6706,25 +6707,11 @@ static void __exit ata_exit(void) subsys_initcall(ata_init); module_exit(ata_exit); -static unsigned long ratelimit_time; -static DEFINE_SPINLOCK(ata_ratelimit_lock); +static DEFINE_RATELIMIT_STATE(ratelimit, HZ / 5, 1); int ata_ratelimit(void) { - int rc; - unsigned long flags; - - spin_lock_irqsave(&ata_ratelimit_lock, flags); - - if (time_after(jiffies, ratelimit_time)) { - rc = 1; - ratelimit_time = jiffies + (HZ/5); - } else - rc = 0; - - spin_unlock_irqrestore(&ata_ratelimit_lock, flags); - - return rc; + return __ratelimit(&ratelimit); } /** |
