Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

[safe/jmp/linux-2.6] / drivers / uwb / est.c

diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c
index 3791cd9..328fcc2 100644 (file)
--- a/drivers/uwb/est.c
+++ b/drivers/uwb/est.c
@@ -40,10 +40,8 @@
  *   uwb_est_get_size()
  */
 #include <linux/spinlock.h>
-#define D_LOCAL 0
-#include <linux/uwb/debug.h>
-#include "uwb-internal.h"
 
+#include "uwb-internal.h"
 
 struct uwb_est {
        u16 type_event_high;
@@ -52,7 +50,6 @@ struct uwb_est {
        const struct uwb_est_entry *entry;
 };
 
-
 static struct uwb_est *uwb_est;
 static u8 uwb_est_size;
 static u8 uwb_est_used;
@@ -363,22 +360,17 @@ ssize_t uwb_est_get_size(struct uwb_rc *uwb_rc, struct uwb_est *est,
 
        size = -ENOENT;
        if (event_low >= est->entries) {        /* in range? */
-               if (printk_ratelimit())
-                       dev_err(dev, "EST %p 0x%04x/%04x/%04x[%u]: "
-                               "event %u out of range\n",
-                               est, est->type_event_high, est->vendor,
-                               est->product, est->entries,
-                               event_low);
+               dev_err(dev, "EST %p 0x%04x/%04x/%04x[%u]: event %u out of range\n",
+                       est, est->type_event_high, est->vendor, est->product,
+                       est->entries, event_low);
                goto out;
        }
        size = -ENOENT;
        entry = &est->entry[event_low];
        if (entry->size == 0 && entry->offset == 0) {   /* unknown? */
-               if (printk_ratelimit())
-                       dev_err(dev, "EST %p 0x%04x/%04x/%04x[%u]: "
-                               "event %u unknown\n",
-                               est, est->type_event_high, est->vendor,
-                               est->product, est->entries, event_low);
+               dev_err(dev, "EST %p 0x%04x/%04x/%04x[%u]: event %u unknown\n",
+                       est, est->type_event_high, est->vendor, est->product,
+                       est->entries, event_low);
                goto out;
        }
        offset = entry->offset; /* extra fries with that? */
@@ -396,11 +388,10 @@ ssize_t uwb_est_get_size(struct uwb_rc *uwb_rc, struct uwb_est *est,
                default:         BUG();
                }
                if (offset + type_size > rceb_size) {
-                       if (printk_ratelimit())
-                               dev_err(dev, "EST %p 0x%04x/%04x/%04x[%u]: "
-                                       "not enough data to read extra size\n",
-                                       est, est->type_event_high, est->vendor,
-                                       est->product, est->entries);
+                       dev_err(dev, "EST %p 0x%04x/%04x/%04x[%u]: "
+                               "not enough data to read extra size\n",
+                               est, est->type_event_high, est->vendor,
+                               est->product, est->entries);
                        goto out;
                }
                size = entry->size;
@@ -446,21 +437,12 @@ ssize_t uwb_est_find_size(struct uwb_rc *rc, const struct uwb_rceb *rceb,
        u8 *ptr = (u8 *) rceb;
 
        read_lock_irqsave(&uwb_est_lock, flags);
-       d_printf(2, dev, "Size query for event 0x%02x/%04x/%02x,"
-                " buffer size %ld\n",
-                (unsigned) rceb->bEventType,
-                (unsigned) le16_to_cpu(rceb->wEvent),
-                (unsigned) rceb->bEventContext,
-                (long) rceb_size);
        size = -ENOSPC;
        if (rceb_size < sizeof(*rceb))
                goto out;
        event = le16_to_cpu(rceb->wEvent);
        type_event_high = rceb->bEventType << 8 | (event & 0xff00) >> 8;
        for (itr = 0; itr < uwb_est_used; itr++) {
-               d_printf(3, dev, "Checking EST 0x%04x/%04x/%04x\n",
-                       uwb_est[itr].type_event_high, uwb_est[itr].vendor,
-                       uwb_est[itr].product);
                if (uwb_est[itr].type_event_high != type_event_high)
                        continue;
                size = uwb_est_get_size(rc, &uwb_est[itr],
@@ -469,14 +451,12 @@ ssize_t uwb_est_find_size(struct uwb_rc *rc, const struct uwb_rceb *rceb,
                if (size != -ENOENT)
                        goto out;
        }
-       /* FIXME: downgrade to _dbg() */
-       if (printk_ratelimit())
-               dev_err(dev, "event 0x%02x/%04x/%02x: no handlers available; "
+       dev_dbg(dev, "event 0x%02x/%04x/%02x: no handlers available; "
                "RCEB %02x %02x %02x %02x\n",
-                       (unsigned) rceb->bEventType,
-                       (unsigned) le16_to_cpu(rceb->wEvent),
-                       (unsigned) rceb->bEventContext,
-                       ptr[0], ptr[1], ptr[2], ptr[3]);
+               (unsigned) rceb->bEventType,
+               (unsigned) le16_to_cpu(rceb->wEvent),
+               (unsigned) rceb->bEventContext,
+               ptr[0], ptr[1], ptr[2], ptr[3]);
        size = -ENOENT;
 out:
        read_unlock_irqrestore(&uwb_est_lock, flags);