From 1fbd3a427ce005458bcbdbbbc5914a5a57ed9592 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 24 Mar 2009 16:38:23 -0700 Subject: [PATCH] --- yaml --- r: 133431 b: refs/heads/master c: cf43f4ab3a065296822bb245975d006707ccde8d h: refs/heads/master i: 133429: 2c7ec787a0646e9f7dfacaa0aa12afbecbb2c38e 133427: 77f03af781cfea60aee0b6107c3e6f382ba16403 133423: 668bb095741307a6a2131640d1583a7dd057218b v: v3 --- [refs] | 2 +- trunk/drivers/mca/mca-bus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index da003df6dc09..c875ed476dd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e274bd02b04064632492a86fe99d3b613c74d84 +refs/heads/master: cf43f4ab3a065296822bb245975d006707ccde8d diff --git a/trunk/drivers/mca/mca-bus.c b/trunk/drivers/mca/mca-bus.c index ef2dbfe74714..ada5ebbaa255 100644 --- a/trunk/drivers/mca/mca-bus.c +++ b/trunk/drivers/mca/mca-bus.c @@ -110,7 +110,7 @@ int __init mca_register_device(int bus, struct mca_device *mca_dev) mca_dev->dev.parent = &mca_bus->dev; mca_dev->dev.bus = &mca_bus_type; - sprintf (mca_dev->dev.bus_id, "%02d:%02X", bus, mca_dev->slot); + dev_set_name(&mca_dev->dev, "%02d:%02X", bus, mca_dev->slot); mca_dev->dma_mask = mca_bus->default_dma_mask; mca_dev->dev.dma_mask = &mca_dev->dma_mask; mca_dev->dev.coherent_dma_mask = mca_dev->dma_mask; @@ -151,7 +151,7 @@ struct mca_bus * __devinit mca_attach_bus(int bus) if (!mca_bus) return NULL; - sprintf(mca_bus->dev.bus_id,"mca%d",bus); + dev_set_name(&mca_bus->dev, "mca%d", bus); sprintf(mca_bus->name,"Host %s MCA Bridge", bus ? "Secondary" : "Primary"); if (device_register(&mca_bus->dev)) { kfree(mca_bus);