Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / rapidio / rio-scan.c

diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 643a6b98462b67062487fec8e37e505fe9c50cd1..74d0bfa3f3108c020ed9c7b59a0262e8549188df 100644 (file)
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -365,15 +365,15 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
                                rdid++)
                        rswitch->route_table[rdid] = RIO_INVALID_ROUTE;
                rdev->rswitch = rswitch;
-               sprintf(rio_name(rdev), "%02x:s:%04x", rdev->net->id,
-                       rdev->rswitch->switchid);
+               dev_set_name(&rdev->dev, "%02x:s:%04x", rdev->net->id,
+                            rdev->rswitch->switchid);
                rio_route_set_ops(rdev);
 
                list_add_tail(&rswitch->node, &rio_switches);
 
        } else
-               sprintf(rio_name(rdev), "%02x:e:%04x", rdev->net->id,
-                       rdev->destid);
+               dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id,
+                            rdev->destid);
 
        rdev->dev.bus = &rio_bus_type;
 
@@ -381,9 +381,9 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
        rdev->dev.release = rio_release_dev;
        rio_dev_get(rdev);
 
-       rdev->dma_mask = DMA_32BIT_MASK;
+       rdev->dma_mask = DMA_BIT_MASK(32);
        rdev->dev.dma_mask = &rdev->dma_mask;
-       rdev->dev.coherent_dma_mask = DMA_32BIT_MASK;
+       rdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 
        if ((rdev->pef & RIO_PEF_INB_DOORBELL) &&
            (rdev->dst_ops & RIO_DST_OPS_DOORBELL))