Skip to content

F
FMC Bus
Commit f685f5b1 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

fmc-core: remove extra device (/sys/devices/fmc/) 

The fmc devices are now children of their own device.

This is what we had with fmc-fakedev and 1 mezzanine using a custom eeprom:
tha lead to custom names):

spusa.root# ls -l /sys/bus/fmc/devices/
 FmcDelay1ns4cha-f001 -> ../../../devices/fmc/FmcDelay1ns4cha-f001/

And this is what we have now:

spusa.root# ls -l /sys/bus/fmc/devices/
 FmcDelay1ns4cha-f001 -> ../../../devices/fake-fmc-carrier/FmcDelay1ns4cha-f001/
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 6060c109
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 19 deletions
kernel/fmc-core.c
View file @ f685f5b1
......@@ -70,12 +70,6 @@ static struct bus_type fmc_bus_type = {
/* We really have nothing to release in here */
static void __fmc_release(struct device *dev) { }
/* This is needed as parent for our devices and dir in sysfs */
struct device fmc_bus = {
.release = __fmc_release,
.init_name = "fmc",
};
/*
* Functions for client modules follow
*/
......@@ -153,7 +147,7 @@ int fmc_device_register_n(struct fmc_device *fmcs, int n)
if (!fmc->dev.release)
fmc->dev.release = __fmc_release;
if (!fmc->dev.parent)
fmc->dev.parent = &fmc_bus;
fmc->dev.parent = fmc->hwdev;
/* Fill the identification stuff (may fail) */
fmc_fill_id_info(fmc);
......@@ -228,23 +222,12 @@ EXPORT_SYMBOL(fmc_device_unregister);
/* Init and exit are trivial */
static int fmc_init(void)
{
int err;
err = device_register(&fmc_bus);
if (err) {
put_device(&fmc_bus);
return err;
}
err = bus_register(&fmc_bus_type);
if (err)
device_unregister(&fmc_bus);
return err;
return bus_register(&fmc_bus_type);
}
static void fmc_exit(void)
{
bus_unregister(&fmc_bus_type);
device_unregister(&fmc_bus);
}
module_init(fmc_init);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment