Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit cf43f4ab3a065296822bb245975d006707ccde8d

Authored by Kay Sievers
Committed by Greg Kroah-Hartman
1 parent 3e274bd02b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

mca: struct device - replace bus_id with dev_name(), dev_set_name() 

Cc: James.Bottomley@HansenPartnership.com
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/mca/mca-bus.c
Diff comments   View file @ cf43f4a
... ... @@ -110,7 +110,7 @@
110 110  
111 111 mca_dev->dev.parent = &mca_bus->dev;
112 112 mca_dev->dev.bus = &mca_bus_type;
113   - sprintf (mca_dev->dev.bus_id, "%02d:%02X", bus, mca_dev->slot);
  113 + dev_set_name(&mca_dev->dev, "%02d:%02X", bus, mca_dev->slot);
114 114 mca_dev->dma_mask = mca_bus->default_dma_mask;
115 115 mca_dev->dev.dma_mask = &mca_dev->dma_mask;
116 116 mca_dev->dev.coherent_dma_mask = mca_dev->dma_mask;
... ... @@ -151,7 +151,7 @@
151 151 if (!mca_bus)
152 152 return NULL;
153 153  
154   - sprintf(mca_bus->dev.bus_id,"mca%d",bus);
  154 + dev_set_name(&mca_bus->dev, "mca%d", bus);
155 155 sprintf(mca_bus->name,"Host %s MCA Bridge", bus ? "Secondary" : "Primary");
156 156 if (device_register(&mca_bus->dev)) {
157 157 kfree(mca_bus);