#ifdef ACPI_CSTATE_LIMIT_DEFINED
        if (priv->config & CFG_C3_DISABLED) {
-               IPW_DEBUG_INFO(DRV_NAME ": Resetting C3 transitions.\n");
+               IPW_DEBUG_INFO(": Resetting C3 transitions.\n");
                acpi_set_cstate_limit(priv->cstate_limit);
                priv->config &= ~CFG_C3_DISABLED;
        }
        int associated = priv->status & STATUS_ASSOCIATED;
 
        spin_lock_irqsave(&priv->low_lock, flags);
-       IPW_DEBUG_INFO(DRV_NAME ": %s: Restarting adapter.\n",
-                      priv->net_dev->name);
+       IPW_DEBUG_INFO(": %s: Restarting adapter.\n", priv->net_dev->name);
        priv->resets++;
        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
        priv->status |= STATUS_SECURITY_UPDATED;
 
 #ifdef ACPI_CSTATE_LIMIT_DEFINED
        if (priv->config & CFG_C3_DISABLED) {
-               IPW_DEBUG_INFO(DRV_NAME ": Resetting C3 transitions.\n");
+               IPW_DEBUG_INFO(": Resetting C3 transitions.\n");
                acpi_set_cstate_limit(priv->cstate_limit);
                priv->config &= ~CFG_C3_DISABLED;
        }
        int limit;
 #endif
 
-       IPW_DEBUG_INFO(DRV_NAME ": PCI latency error detected at "
-                      "0x%04zX.\n", i * sizeof(struct ipw2100_status));
+       IPW_DEBUG_INFO(": PCI latency error detected at 0x%04zX.\n",
+                      i * sizeof(struct ipw2100_status));
 
 #ifdef ACPI_CSTATE_LIMIT_DEFINED
-       IPW_DEBUG_INFO(DRV_NAME ": Disabling C3 transitions.\n");
+       IPW_DEBUG_INFO(": Disabling C3 transitions.\n");
        limit = acpi_get_cstate_limit();
        if (limit > 2) {
                priv->cstate_limit = limit;
        } else
                val = simple_strtoul(p, &p, 10);
        if (p == buf)
-               IPW_DEBUG_INFO(DRV_NAME
-                              ": %s is not in hex or decimal form.\n", buf);
+               IPW_DEBUG_INFO(": %s is not in hex or decimal form.\n", buf);
        else
                ipw2100_debug_level = val;