Commit 8c64f214 authored by Federico Vaga's avatar Federico Vaga

kernel|lib: change driver name and device name

The name 'ft' is not meaningful for everyone
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 68bc92e8
......@@ -327,13 +327,13 @@ static struct zio_device ft_tmpl = {
};
static const struct zio_device_id ft_table[] = {
{"ft", &ft_tmpl},
{"tdc-1n5c", &ft_tmpl},
{},
};
static struct zio_driver ft_zdrv = {
.driver = {
.name = "ft",
.name = "tdc-1n5c",
.owner = THIS_MODULE,
},
.id_table = ft_table,
......@@ -374,7 +374,7 @@ int ft_zio_init(struct fmctdc_dev *ft)
dev_id = ft->fmc->device_id;
err = zio_register_device(ft->hwzdev, "ft", dev_id);
err = zio_register_device(ft->hwzdev, "tdc-1n5c", dev_id);
if (err) {
zio_free_device(ft->hwzdev);
return err;
......
......@@ -43,14 +43,14 @@ int fmctdc_init(void)
uint32_t v;
/* Look for boards in /dev: old and new pathnames: only one matches */
glob("/dev/ft-*-0-0-ctrl", 0, NULL, &glob_dev);
glob("/dev/zio/ft-*-0-0-ctrl", GLOB_APPEND, NULL, &glob_dev);
glob("/dev/zio-ft-*-0-0-ctrl", GLOB_APPEND, NULL, &glob_dev);
glob("/dev/zio/zio-ft-*-0-0-ctrl", GLOB_APPEND, NULL, &glob_dev);
glob("/dev/tdc-1n5c-*-0-0-ctrl", 0, NULL, &glob_dev);
glob("/dev/zio/tdc-1n5c-*-0-0-ctrl", GLOB_APPEND, NULL, &glob_dev);
glob("/dev/zio-tdc-1n5c-*-0-0-ctrl", GLOB_APPEND, NULL, &glob_dev);
glob("/dev/zio/zio-tdc-1n5c-*-0-0-ctrl", GLOB_APPEND, NULL, &glob_dev);
/* And look in /sys as well */
glob("/sys/bus/zio/devices/ft-*", 0, NULL, &glob_sys);
glob("/sys/bus/zio/devices/zio-ft-*", GLOB_APPEND, NULL, &glob_sys);
glob("/sys/bus/zio/devices/tdc-1n5c-*", 0, NULL, &glob_sys);
glob("/sys/bus/zio/devices/zio-tdc-1n5c-*", GLOB_APPEND, NULL, &glob_sys);
assert(glob_dev.gl_pathc == glob_sys.gl_pathc);
/* Allocate as needed */
......
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