Merge branch 'topic/of' into for-linus

4fa7393b · Vinod Koul · ca36ed0c · 5ab64902 · 4fa7393b
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

drivers/dma/nbpfaxi.c drivers/dma/nbpfaxi.c +2 -2

未找到文件。
--- a/drivers/dma/nbpfaxi.c
+++ b/drivers/dma/nbpfaxi.c
@@ -1095,8 +1095,8 @@ static struct dma_chan *nbpf_of_xlate(struct of_phandle_args *dma_spec,
 	if (!dchan)
 		return NULL;

-	dev_dbg(dchan->device->dev, "Entry %s(%s)\n", __func__,
-		dma_spec->np->name);
+	dev_dbg(dchan->device->dev, "Entry %s(%pOFn)\n", __func__,
+		dma_spec->np);

 	chan = nbpf_to_chan(dchan);