Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/rar/rar_driver.c | 38 ++++++++++++++++++--------------------
drivers/staging/rar/rar_driver.h | 10 +++++-----
2 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/rar/rar_driver.c b/drivers/staging/rar/rar_driver.c
index 9805d74..66c7ffa 100644
--- a/drivers/staging/rar/rar_driver.c
+++ b/drivers/staging/rar/rar_driver.c
@@ -140,7 +140,7 @@ static int memrar_get_rar_addr(struct pci_dev* pdev,
| (offset << 8)
| (LNC_MESSAGE_BYTE_WRITE_ENABLES << 4);
- printk(KERN_WARNING "rar- offset to LNC MSG is %x\n",offset);
+ pr_warning("rar- offset to LNC MSG is %x\n",offset);
if (addr == 0)
return -EINVAL;
@@ -150,19 +150,19 @@ static int memrar_get_rar_addr(struct pci_dev* pdev,
LNC_MCR_OFFSET,
message);
- printk(KERN_WARNING "rar- result from send ctl register is %x\n"
- ,result);
+ pr_warning("rar- result from send ctl register is %x\n"
+ ,result);
if (!result)
result = pci_read_config_dword(pdev,
LNC_MDR_OFFSET,
addr);
- printk(KERN_WARNING "rar- result from read data register is %x\n",
- result);
+ pr_warning("rar- result from read data register is %x\n",
+ result);
- printk(KERN_WARNING "rar- value read from data register is %x\n",
- *addr);
+ pr_warning("rar- value read from data register is %x\n",
+ *addr);
if (result)
return -1;
@@ -225,7 +225,7 @@ static int memrar_set_rar_addr(struct pci_dev* pdev,
| (offset << 8)
| (LNC_MESSAGE_BYTE_WRITE_ENABLES << 4);
- printk(KERN_WARNING "rar- offset to LNC MSG is %x\n",offset);
+ pr_warning("rar- offset to LNC MSG is %x\n",offset);
if (addr == 0)
return -EINVAL;
@@ -235,19 +235,19 @@ static int memrar_set_rar_addr(struct pci_dev* pdev,
LNC_MDR_OFFSET,
addr);
- printk(KERN_WARNING "rar- result from send ctl register is %x\n"
- ,result);
+ pr_warning("rar- result from send ctl register is %x\n"
+ ,result);
if (!result)
result = pci_write_config_dword(pdev,
LNC_MCR_OFFSET,
message);
- printk(KERN_WARNING "rar- result from write data register is %x\n",
- result);
+ pr_warning("rar- result from write data register is %x\n",
+ result);
- printk(KERN_WARNING "rar- value read to data register is %x\n",
- addr);
+ pr_warning("rar- value read to data register is %x\n",
+ addr);
if (result)
return -1;
@@ -305,12 +305,10 @@ static int memrar_init_rar_params(struct pci_dev *pdev)
if(1) {
size_t z;
for (z = 0; z != MRST_NUM_RAR; ++z) {
- printk(KERN_WARNING "rar - BRAR[%Zd] physical address low\n"
- "\tlow: 0x%08x\n"
- "\thigh: 0x%08x\n",
- z,
- rar_addr[z].low,
- rar_addr[z].high);
+ pr_warning("rar - BRAR[%Zd] physical address low\n\tlow: 0x%08x\n\thigh: 0x%08x\n",
+ z,
+ rar_addr[z].low,
+ rar_addr[z].high);
}
}
}
diff --git a/drivers/staging/rar/rar_driver.h b/drivers/staging/rar/rar_driver.h
index 3690f98..a3df973 100644
--- a/drivers/staging/rar/rar_driver.h
+++ b/drivers/staging/rar/rar_driver.h
@@ -53,7 +53,7 @@ do \
{ \
if(DEBUG_LEVEL) \
{ \
- printk(KERN_WARNING info); \
+ pr_warning(info); \
} \
}while(0)
@@ -63,7 +63,7 @@ do \
{ \
if(DEBUG_LEVEL) \
{ \
- printk(KERN_WARNING info , param1); \
+ pr_warning(info , param1); \
} \
}while(0)
@@ -73,7 +73,7 @@ do \
{ \
if(DEBUG_LEVEL) \
{ \
- printk(KERN_WARNING info , param1, param2); \
+ pr_warning(info , param1, param2); \
} \
}while(0)
@@ -83,7 +83,7 @@ do \
{ \
if(DEBUG_LEVEL) \
{ \
- printk(KERN_WARNING info , param1, param2 , param3); \
+ pr_warning(info , param1, param2 , param3); \
} \
}while(0)
@@ -93,7 +93,7 @@ do \
{ \
if(DEBUG_LEVEL) \
{ \
- printk(KERN_WARNING info , param1, param2 , param3 , param4); \
+ pr_warning(info , param1, param2 , param3 , param4); \
} \
}while(0)
--
1.6.5.rc3.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
