dma: mv_xor: use dev_(err|info|notice) instead of dev_printk
The usage of dev_printk() is deprecated, and the dev_err(), dev_info() and dev_notice() functions should be used instead. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
1611f87251
commit
a3fc74bc9b
|
@ -206,7 +206,7 @@ static void mv_set_mode(struct mv_xor_chan *chan,
|
||||||
op_mode = XOR_OPERATION_MODE_MEMSET;
|
op_mode = XOR_OPERATION_MODE_MEMSET;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_printk(KERN_ERR, chan->device->common.dev,
|
dev_err(chan->device->common.dev,
|
||||||
"error: unsupported operation %d.\n",
|
"error: unsupported operation %d.\n",
|
||||||
type);
|
type);
|
||||||
BUG();
|
BUG();
|
||||||
|
@ -828,27 +828,27 @@ static void mv_dump_xor_regs(struct mv_xor_chan *chan)
|
||||||
u32 val;
|
u32 val;
|
||||||
|
|
||||||
val = __raw_readl(XOR_CONFIG(chan));
|
val = __raw_readl(XOR_CONFIG(chan));
|
||||||
dev_printk(KERN_ERR, chan->device->common.dev,
|
dev_err(chan->device->common.dev,
|
||||||
"config 0x%08x.\n", val);
|
"config 0x%08x.\n", val);
|
||||||
|
|
||||||
val = __raw_readl(XOR_ACTIVATION(chan));
|
val = __raw_readl(XOR_ACTIVATION(chan));
|
||||||
dev_printk(KERN_ERR, chan->device->common.dev,
|
dev_err(chan->device->common.dev,
|
||||||
"activation 0x%08x.\n", val);
|
"activation 0x%08x.\n", val);
|
||||||
|
|
||||||
val = __raw_readl(XOR_INTR_CAUSE(chan));
|
val = __raw_readl(XOR_INTR_CAUSE(chan));
|
||||||
dev_printk(KERN_ERR, chan->device->common.dev,
|
dev_err(chan->device->common.dev,
|
||||||
"intr cause 0x%08x.\n", val);
|
"intr cause 0x%08x.\n", val);
|
||||||
|
|
||||||
val = __raw_readl(XOR_INTR_MASK(chan));
|
val = __raw_readl(XOR_INTR_MASK(chan));
|
||||||
dev_printk(KERN_ERR, chan->device->common.dev,
|
dev_err(chan->device->common.dev,
|
||||||
"intr mask 0x%08x.\n", val);
|
"intr mask 0x%08x.\n", val);
|
||||||
|
|
||||||
val = __raw_readl(XOR_ERROR_CAUSE(chan));
|
val = __raw_readl(XOR_ERROR_CAUSE(chan));
|
||||||
dev_printk(KERN_ERR, chan->device->common.dev,
|
dev_err(chan->device->common.dev,
|
||||||
"error cause 0x%08x.\n", val);
|
"error cause 0x%08x.\n", val);
|
||||||
|
|
||||||
val = __raw_readl(XOR_ERROR_ADDR(chan));
|
val = __raw_readl(XOR_ERROR_ADDR(chan));
|
||||||
dev_printk(KERN_ERR, chan->device->common.dev,
|
dev_err(chan->device->common.dev,
|
||||||
"error addr 0x%08x.\n", val);
|
"error addr 0x%08x.\n", val);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -861,7 +861,7 @@ static void mv_xor_err_interrupt_handler(struct mv_xor_chan *chan,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_printk(KERN_ERR, chan->device->common.dev,
|
dev_err(chan->device->common.dev,
|
||||||
"error on chan %d. intr cause 0x%08x.\n",
|
"error on chan %d. intr cause 0x%08x.\n",
|
||||||
chan->idx, intr_cause);
|
chan->idx, intr_cause);
|
||||||
|
|
||||||
|
@ -950,7 +950,7 @@ static int __devinit mv_xor_memcpy_self_test(struct mv_xor_device *device)
|
||||||
|
|
||||||
if (mv_xor_status(dma_chan, cookie, NULL) !=
|
if (mv_xor_status(dma_chan, cookie, NULL) !=
|
||||||
DMA_SUCCESS) {
|
DMA_SUCCESS) {
|
||||||
dev_printk(KERN_ERR, dma_chan->device->dev,
|
dev_err(dma_chan->device->dev,
|
||||||
"Self-test copy timed out, disabling\n");
|
"Self-test copy timed out, disabling\n");
|
||||||
err = -ENODEV;
|
err = -ENODEV;
|
||||||
goto free_resources;
|
goto free_resources;
|
||||||
|
@ -960,7 +960,7 @@ static int __devinit mv_xor_memcpy_self_test(struct mv_xor_device *device)
|
||||||
dma_sync_single_for_cpu(&mv_chan->device->pdev->dev, dest_dma,
|
dma_sync_single_for_cpu(&mv_chan->device->pdev->dev, dest_dma,
|
||||||
MV_XOR_TEST_SIZE, DMA_FROM_DEVICE);
|
MV_XOR_TEST_SIZE, DMA_FROM_DEVICE);
|
||||||
if (memcmp(src, dest, MV_XOR_TEST_SIZE)) {
|
if (memcmp(src, dest, MV_XOR_TEST_SIZE)) {
|
||||||
dev_printk(KERN_ERR, dma_chan->device->dev,
|
dev_err(dma_chan->device->dev,
|
||||||
"Self-test copy failed compare, disabling\n");
|
"Self-test copy failed compare, disabling\n");
|
||||||
err = -ENODEV;
|
err = -ENODEV;
|
||||||
goto free_resources;
|
goto free_resources;
|
||||||
|
@ -1048,7 +1048,7 @@ mv_xor_xor_self_test(struct mv_xor_device *device)
|
||||||
|
|
||||||
if (mv_xor_status(dma_chan, cookie, NULL) !=
|
if (mv_xor_status(dma_chan, cookie, NULL) !=
|
||||||
DMA_SUCCESS) {
|
DMA_SUCCESS) {
|
||||||
dev_printk(KERN_ERR, dma_chan->device->dev,
|
dev_err(dma_chan->device->dev,
|
||||||
"Self-test xor timed out, disabling\n");
|
"Self-test xor timed out, disabling\n");
|
||||||
err = -ENODEV;
|
err = -ENODEV;
|
||||||
goto free_resources;
|
goto free_resources;
|
||||||
|
@ -1060,7 +1060,7 @@ mv_xor_xor_self_test(struct mv_xor_device *device)
|
||||||
for (i = 0; i < (PAGE_SIZE / sizeof(u32)); i++) {
|
for (i = 0; i < (PAGE_SIZE / sizeof(u32)); i++) {
|
||||||
u32 *ptr = page_address(dest);
|
u32 *ptr = page_address(dest);
|
||||||
if (ptr[i] != cmp_word) {
|
if (ptr[i] != cmp_word) {
|
||||||
dev_printk(KERN_ERR, dma_chan->device->dev,
|
dev_err(dma_chan->device->dev,
|
||||||
"Self-test xor failed compare, disabling."
|
"Self-test xor failed compare, disabling."
|
||||||
" index %d, data %x, expected %x\n", i,
|
" index %d, data %x, expected %x\n", i,
|
||||||
ptr[i], cmp_word);
|
ptr[i], cmp_word);
|
||||||
|
@ -1212,7 +1212,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev)
|
||||||
goto err_free_dma;
|
goto err_free_dma;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_printk(KERN_INFO, &pdev->dev, "Marvell XOR: "
|
dev_info(&pdev->dev, "Marvell XOR: "
|
||||||
"( %s%s%s%s)\n",
|
"( %s%s%s%s)\n",
|
||||||
dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
|
dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
|
||||||
dma_has_cap(DMA_MEMSET, dma_dev->cap_mask) ? "fill " : "",
|
dma_has_cap(DMA_MEMSET, dma_dev->cap_mask) ? "fill " : "",
|
||||||
|
@ -1275,7 +1275,7 @@ static int mv_xor_shared_probe(struct platform_device *pdev)
|
||||||
struct mv_xor_shared_private *msp;
|
struct mv_xor_shared_private *msp;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
|
|
||||||
dev_printk(KERN_NOTICE, &pdev->dev, "Marvell shared XOR driver\n");
|
dev_notice(&pdev->dev, "Marvell shared XOR driver\n");
|
||||||
|
|
||||||
msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL);
|
msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL);
|
||||||
if (!msp)
|
if (!msp)
|
||||||
|
|
Loading…
Reference in New Issue