FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xpp: deprecate dahdi_autoreg

Browse Source 
Instead, use the inverse of dahdi.auto_assign_spans value.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>
This commit is contained in:
Oron Peled 2014-01-26 16:11:00 +02:00 committed by Tzafrir Cohen
parent 3efa9d8cd1
commit 74e949c33a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dahdi/dahdi-base.c
View File

@ -7373,7 +7373,8 @@ int dahdi_assign_device_spans(struct dahdi_device *ddev)
return 0; return 0;
} }
static int auto_assign_spans = 1; int auto_assign_spans = 1;
EXPORT_SYMBOL(auto_assign_spans);
static const char *UNKNOWN = ""; static const char *UNKNOWN = "";
/** /**

4
drivers/dahdi/xpp/xbus-core.c
View File

@ -61,7 +61,7 @@ static DEF_PARM(uint, poll_timeout, 1000, 0644,
"Timeout (in jiffies) waiting for units to reply"); "Timeout (in jiffies) waiting for units to reply");
static DEF_PARM_BOOL(rx_tasklet, 0, 0644, "Use receive tasklets"); static DEF_PARM_BOOL(rx_tasklet, 0, 0644, "Use receive tasklets");
static DEF_PARM_BOOL(dahdi_autoreg, 1, 0644, static DEF_PARM_BOOL(dahdi_autoreg, 1, 0644,
"Register devices automatically (1) or not (0)"); "Register devices automatically (1) or not (0). UNUSED.");
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static const struct file_operations xbus_read_proc_ops; static const struct file_operations xbus_read_proc_ops;
@ -1118,7 +1118,7 @@ void xbus_populate(void *data)
*/ */
xbus_request_sync(xbus, SYNC_MODE_PLL); xbus_request_sync(xbus, SYNC_MODE_PLL);
elect_syncer("xbus_populate(end)"); /* FIXME: try to do it later */ elect_syncer("xbus_populate(end)"); /* FIXME: try to do it later */
if (dahdi_autoreg) if (!auto_assign_spans)
xbus_register_dahdi_device(xbus); xbus_register_dahdi_device(xbus);
out: out:
XBUS_DBG(DEVICES, xbus, "Leaving\n"); XBUS_DBG(DEVICES, xbus, "Leaving\n");

1
include/dahdi/kernel.h
View File

@ -1279,6 +1279,7 @@ static inline void dahdi_ec_span(struct dahdi_span *span)
} }
extern struct file_operations *dahdi_transcode_fops; extern struct file_operations *dahdi_transcode_fops;
extern int auto_assign_spans;
/* Don't use these directly -- they're not guaranteed to /* Don't use these directly -- they're not guaranteed to
be there. */ be there. */