Merge branch 'linus' into sched/core

Conflicts:
	kernel/Makefile

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index dc003a3a787d..5317e08221ec 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -399,8 +399,8 @@ int dma_async_device_register(struct dma_device *device)
                 chan->chan_id = chancnt++;
                 chan->dev.class = &dma_devclass;
                 chan->dev.parent = device->dev;
-                snprintf(chan->dev.bus_id, BUS_ID_SIZE, "dma%dchan%d",
-                         device->dev_id, chan->chan_id);
+                dev_set_name(&chan->dev, "dma%dchan%d",
+                             device->dev_id, chan->chan_id);
 
                 rc = device_register(&chan->dev);
                 if (rc) {