5 files changed, 4 insertions, 9 deletions

diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c
index e15f064..39fe907 100644
--- a/drivers/dahdi/xpp/card_bri.c
+++ b/drivers/dahdi/xpp/card_bri.c
@@ -862,6 +862,7 @@ static int BRI_card_remove(xbus_t *xbus, xpd_t *xpd)
 }
 
 static const struct dahdi_span_ops BRI_span_ops = {
+	.owner = THIS_MODULE,
 	.spanconfig = bri_spanconfig,
 	.chanconfig = bri_chanconfig,
 	.startup = bri_startup,
@@ -897,7 +898,6 @@ static int BRI_card_dahdi_preregistration(xpd_t *xpd, bool on)
 		/* Nothing to do yet */
 		return 0;
 	}
-	xpd->span.owner = THIS_MODULE;
 	xpd->span.spantype = "BRI";
 	xpd->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS;
 	xpd->span.deflaw = DAHDI_LAW_ALAW;
diff --git a/drivers/dahdi/xpp/card_fxo.c b/drivers/dahdi/xpp/card_fxo.c
index 474e217..596cbc0 100644
--- a/drivers/dahdi/xpp/card_fxo.c
+++ b/drivers/dahdi/xpp/card_fxo.c
@@ -511,8 +511,6 @@ static int FXO_card_dahdi_preregistration(xpd_t *xpd, bool on)
 	BUG_ON(!priv);
 	timer_count = xpd->timer_count;
 	XPD_DBG(GENERAL, xpd, "%s\n", (on)?"ON":"OFF");
-	xpd->span.owner = THIS_MODULE;
-	xpd->span.spantype = "FXO";
 	for_each_line(xpd, i) {
 		struct dahdi_chan	*cur_chan = XPD_CHAN(xpd, i);
 
diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c
index cbafab0..050833e 100644
--- a/drivers/dahdi/xpp/card_fxs.c
+++ b/drivers/dahdi/xpp/card_fxs.c
@@ -496,7 +496,6 @@ static int FXS_card_dahdi_preregistration(xpd_t *xpd, bool on)
 	priv = xpd->priv;
 	BUG_ON(!priv);
 	XPD_DBG(GENERAL, xpd, "%s\n", (on)?"on":"off");
-	xpd->span.owner = THIS_MODULE;
 	xpd->span.spantype = "FXS";
 	for_each_line(xpd, i) {
 		struct dahdi_chan	*cur_chan = XPD_CHAN(xpd, i);
diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c
index 1003188..b84ddf7 100644
--- a/drivers/dahdi/xpp/card_pri.c
+++ b/drivers/dahdi/xpp/card_pri.c
@@ -1274,6 +1274,7 @@ static int pri_audio_notify(struct dahdi_chan *chan, int on)
 #endif
 
 static const struct dahdi_span_ops PRI_span_ops = {
+	.owner = THIS_MODULE,
 	.spanconfig = pri_spanconfig,
 	.chanconfig = pri_chanconfig,
 	.startup = pri_startup,
@@ -1315,7 +1316,6 @@ static int PRI_card_dahdi_preregistration(xpd_t *xpd, bool on)
 		/* Nothing to do yet */
 		return 0;
 	}
-	xpd->span.owner = THIS_MODULE;
 	xpd->span.spantype = pri_protocol_name(priv->pri_protocol);
 	xpd->span.linecompat = pri_linecompat(priv->pri_protocol);
 	xpd->span.deflaw = priv->deflaw;
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;