diff options
author | Zhu Yi <chuyee@debian.sh.intel.com> | 2005-07-04 02:06:00 -0400 |
---|---|---|
committer | James Ketrenos <jketreno@linux.intel.com> | 2005-11-07 18:49:47 -0500 |
commit | a1e695adca76f5729224242e4f2f9f6ceb6863d1 (patch) | |
tree | 1a335c4a602d34d22173c77788f0d9ad00ef8310 /drivers/net/wireless/ipw2100.c | |
parent | ee8e365aa6395e721399127ccf3d28d269136f0e (diff) |
IPW_DEBUG has already included DRV_NAME, remove double prefix print.
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
-rw-r--r-- | drivers/net/wireless/ipw2100.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index a15eef1c2a62..449c1c085fb9 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
@@ -1833,7 +1833,7 @@ static void ipw2100_down(struct ipw2100_priv *priv) | |||
1833 | 1833 | ||
1834 | #ifdef ACPI_CSTATE_LIMIT_DEFINED | 1834 | #ifdef ACPI_CSTATE_LIMIT_DEFINED |
1835 | if (priv->config & CFG_C3_DISABLED) { | 1835 | if (priv->config & CFG_C3_DISABLED) { |
1836 | IPW_DEBUG_INFO(DRV_NAME ": Resetting C3 transitions.\n"); | 1836 | IPW_DEBUG_INFO(": Resetting C3 transitions.\n"); |
1837 | acpi_set_cstate_limit(priv->cstate_limit); | 1837 | acpi_set_cstate_limit(priv->cstate_limit); |
1838 | priv->config &= ~CFG_C3_DISABLED; | 1838 | priv->config &= ~CFG_C3_DISABLED; |
1839 | } | 1839 | } |
@@ -1858,8 +1858,7 @@ static void ipw2100_reset_adapter(struct ipw2100_priv *priv) | |||
1858 | int associated = priv->status & STATUS_ASSOCIATED; | 1858 | int associated = priv->status & STATUS_ASSOCIATED; |
1859 | 1859 | ||
1860 | spin_lock_irqsave(&priv->low_lock, flags); | 1860 | spin_lock_irqsave(&priv->low_lock, flags); |
1861 | IPW_DEBUG_INFO(DRV_NAME ": %s: Restarting adapter.\n", | 1861 | IPW_DEBUG_INFO(": %s: Restarting adapter.\n", priv->net_dev->name); |
1862 | priv->net_dev->name); | ||
1863 | priv->resets++; | 1862 | priv->resets++; |
1864 | priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING); | 1863 | priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING); |
1865 | priv->status |= STATUS_SECURITY_UPDATED; | 1864 | priv->status |= STATUS_SECURITY_UPDATED; |
@@ -2062,7 +2061,7 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status) | |||
2062 | 2061 | ||
2063 | #ifdef ACPI_CSTATE_LIMIT_DEFINED | 2062 | #ifdef ACPI_CSTATE_LIMIT_DEFINED |
2064 | if (priv->config & CFG_C3_DISABLED) { | 2063 | if (priv->config & CFG_C3_DISABLED) { |
2065 | IPW_DEBUG_INFO(DRV_NAME ": Resetting C3 transitions.\n"); | 2064 | IPW_DEBUG_INFO(": Resetting C3 transitions.\n"); |
2066 | acpi_set_cstate_limit(priv->cstate_limit); | 2065 | acpi_set_cstate_limit(priv->cstate_limit); |
2067 | priv->config &= ~CFG_C3_DISABLED; | 2066 | priv->config &= ~CFG_C3_DISABLED; |
2068 | } | 2067 | } |
@@ -2300,11 +2299,11 @@ static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i) | |||
2300 | int limit; | 2299 | int limit; |
2301 | #endif | 2300 | #endif |
2302 | 2301 | ||
2303 | IPW_DEBUG_INFO(DRV_NAME ": PCI latency error detected at " | 2302 | IPW_DEBUG_INFO(": PCI latency error detected at 0x%04zX.\n", |
2304 | "0x%04zX.\n", i * sizeof(struct ipw2100_status)); | 2303 | i * sizeof(struct ipw2100_status)); |
2305 | 2304 | ||
2306 | #ifdef ACPI_CSTATE_LIMIT_DEFINED | 2305 | #ifdef ACPI_CSTATE_LIMIT_DEFINED |
2307 | IPW_DEBUG_INFO(DRV_NAME ": Disabling C3 transitions.\n"); | 2306 | IPW_DEBUG_INFO(": Disabling C3 transitions.\n"); |
2308 | limit = acpi_get_cstate_limit(); | 2307 | limit = acpi_get_cstate_limit(); |
2309 | if (limit > 2) { | 2308 | if (limit > 2) { |
2310 | priv->cstate_limit = limit; | 2309 | priv->cstate_limit = limit; |
@@ -4001,8 +4000,7 @@ static ssize_t store_debug_level(struct device_driver *d, const char *buf, | |||
4001 | } else | 4000 | } else |
4002 | val = simple_strtoul(p, &p, 10); | 4001 | val = simple_strtoul(p, &p, 10); |
4003 | if (p == buf) | 4002 | if (p == buf) |
4004 | IPW_DEBUG_INFO(DRV_NAME | 4003 | IPW_DEBUG_INFO(": %s is not in hex or decimal form.\n", buf); |
4005 | ": %s is not in hex or decimal form.\n", buf); | ||
4006 | else | 4004 | else |
4007 | ipw2100_debug_level = val; | 4005 | ipw2100_debug_level = val; |
4008 | 4006 | ||