evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bcma: move code for core registration into separate function

Browse source 
This cleans code a bit and will us to register cores in other places as
well. The only difference with this patch is using "core_index" for
setting device name.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki 2014-09-05 00:18:48 +02:00 • committed by John W. Linville
parent ed364abffd
commit 6e094bd805
1 changed files with 36 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
drivers/bcma/main.c
View file

@ -120,10 +120,42 @@ static void bcma_release_core_dev(struct device *dev)
kfree(core); kfree(core);
} }
static int bcma_register_cores(struct bcma_bus *bus) static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
{
int err;
core->dev.release = bcma_release_core_dev;
core->dev.bus = &bcma_bus_type;
dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
switch (bus->hosttype) {
case BCMA_HOSTTYPE_PCI:
core->dev.parent = &bus->host_pci->dev;
core->dma_dev = &bus->host_pci->dev;
core->irq = bus->host_pci->irq;
break;
case BCMA_HOSTTYPE_SOC:
core->dev.dma_mask = &core->dev.coherent_dma_mask;
core->dma_dev = &core->dev;
break;
case BCMA_HOSTTYPE_SDIO:
break;
}
err = device_register(&core->dev);
if (err) {
bcma_err(bus, "Could not register dev for core 0x%03X\n",
core->id.id);
put_device(&core->dev);
return;
}
core->dev_registered = true;
}
static int bcma_register_devices(struct bcma_bus *bus)
{ {
struct bcma_device *core; struct bcma_device *core;
int err, dev_id = 0; int err;
list_for_each_entry(core, &bus->cores, list) { list_for_each_entry(core, &bus->cores, list) {
/* We support that cores ourself */ /* We support that cores ourself */
@ -143,34 +175,7 @@ static int bcma_register_cores(struct bcma_bus *bus)
core->core_unit > 0) core->core_unit > 0)
continue; continue;
core->dev.release = bcma_release_core_dev; bcma_register_core(bus, core);
core->dev.bus = &bcma_bus_type;
dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
switch (bus->hosttype) {
case BCMA_HOSTTYPE_PCI:
core->dev.parent = &bus->host_pci->dev;
core->dma_dev = &bus->host_pci->dev;
core->irq = bus->host_pci->irq;
break;
case BCMA_HOSTTYPE_SOC:
core->dev.dma_mask = &core->dev.coherent_dma_mask;
core->dma_dev = &core->dev;
break;
case BCMA_HOSTTYPE_SDIO:
break;
}
err = device_register(&core->dev);
if (err) {
bcma_err(bus,
"Could not register dev for core 0x%03X\n",
core->id.id);
put_device(&core->dev);
continue;
}
core->dev_registered = true;
dev_id++;
} }
#ifdef CONFIG_BCMA_DRIVER_MIPS #ifdef CONFIG_BCMA_DRIVER_MIPS
@ -297,7 +302,7 @@ int bcma_bus_register(struct bcma_bus *bus)
} }
/* Register found cores */ /* Register found cores */
bcma_register_cores(bus); bcma_register_devices(bus);
bcma_info(bus, "Bus registered\n"); bcma_info(bus, "Bus registered\n");