diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-07-26 00:30:43 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-07-26 00:30:43 +0000 |
| commit | b764ebded8f543d62e1a19463db7c2926b9b22e0 (patch) | |
| tree | 60e0b36a1f89a6339bd3a357420c1f1152224a2a /drivers/dahdi/xpp/xpp_dahdi.c | |
| parent | 113b9311ebca9311befbd017eb27f6a25949e6a6 (diff) | |
dahdi: Move the 'owner' field from dahdi_span to dahdi_span_ops.
One more thing that can be moved out of the per-span structure.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8986 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/xpp_dahdi.c')
| -rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 82157f6..6bc0663 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -1070,6 +1070,7 @@ int dahdi_unregister_xpd(xpd_t *xpd) } static const struct dahdi_span_ops xpp_span_ops = { + .owner = THIS_MODULE, .open = xpp_open, .close = xpp_close, .ioctl = xpp_ioctl, @@ -1077,6 +1078,7 @@ static const struct dahdi_span_ops xpp_span_ops = { }; static const struct dahdi_span_ops xpp_rbs_span_ops = { + .owner = THIS_MODULE, .hooksig = xpp_hooksig, .open = xpp_open, .close = xpp_close, @@ -1158,10 +1160,6 @@ int dahdi_register_xpd(xpd_t *xpd) xbus->num, xpd->addr.unit, xpd->addr.subunit, xpd->type_name); XPD_DBG(GENERAL, xpd, "Registering span '%s'\n", xpd->span.desc); xpd->xops->card_dahdi_preregistration(xpd, 1); - if(!xpd->span.owner) { - XPD_ERR(xpd, "NO span.owner field -- bug in low-level driver\n"); - WARN_ON(!xpd->span.owner); - } if(dahdi_register(&xpd->span, prefmaster)) { XPD_ERR(xpd, "Failed to dahdi_register span\n"); return -ENODEV; |