From c361dcf36c961992aff20768825f8b4e5c65b6a2 Mon Sep 17 00:00:00 2001
From: Karsten Keil <keil@temic-ech.spacenet.de>
Date: Sun, 11 Jan 2004 13:58:50 +0000
Subject: [PATCH] fix module owner assign

---
 drivers/isdn/hardware/mISDN/avm_fritz.c | 4 +++-
 drivers/isdn/hardware/mISDN/capi.c      | 4 +++-
 drivers/isdn/hardware/mISDN/dsp_core.c  | 2 +-
 drivers/isdn/hardware/mISDN/dtmf.c      | 4 +++-
 drivers/isdn/hardware/mISDN/hfc_pci.c   | 4 +++-
 drivers/isdn/hardware/mISDN/i4l_mISDN.c | 4 +++-
 drivers/isdn/hardware/mISDN/l3_udss1.c  | 4 +++-
 drivers/isdn/hardware/mISDN/layer1.c    | 4 +++-
 drivers/isdn/hardware/mISDN/layer2.c    | 4 +++-
 drivers/isdn/hardware/mISDN/sedl_fax.c  | 4 +++-
 drivers/isdn/hardware/mISDN/w6692.c     | 4 +++-
 drivers/isdn/hardware/mISDN/x25_dte.c   | 4 +++-
 12 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/drivers/isdn/hardware/mISDN/avm_fritz.c b/drivers/isdn/hardware/mISDN/avm_fritz.c
index 0001f91..265af1a 100644
--- a/drivers/isdn/hardware/mISDN/avm_fritz.c
+++ b/drivers/isdn/hardware/mISDN/avm_fritz.c
@@ -1343,7 +1343,9 @@ static int __init Fritz_init(void)
 
 	printk(KERN_INFO "AVM Fritz PCI/PnP driver Rev. %s\n", mISDN_getrev(avm_fritz_rev));
 
-	SET_MODULE_OWNER(&fritz);
+#ifdef MODULE
+	fritz.owner = THIS_MODULE;
+#endif
 	fritz.name = FritzName;
 	fritz.own_ctrl = fritz_manager;
 	fritz.DPROTO.protocol[0] = ISDN_PID_L0_TE_S0;
diff --git a/drivers/isdn/hardware/mISDN/capi.c b/drivers/isdn/hardware/mISDN/capi.c
index f1ba1c7..29a244f 100644
--- a/drivers/isdn/hardware/mISDN/capi.c
+++ b/drivers/isdn/hardware/mISDN/capi.c
@@ -390,7 +390,9 @@ int Capi20Init(void)
 	int err;
 
 	printk(KERN_INFO "%s driver file version %s\n", MName, mISDN_getrev(capi_revision));
-	SET_MODULE_OWNER(&capi_obj);
+#ifdef MODULE
+	capi_obj.owner = THIS_MODULE;
+#endif
 	capi_obj.name = MName;
 	capi_obj.DPROTO.protocol[4] = ISDN_PID_L4_CAPI20;
 	capi_obj.BPROTO.protocol[4] = ISDN_PID_L4_B_CAPI20;
diff --git a/drivers/isdn/hardware/mISDN/dsp_core.c b/drivers/isdn/hardware/mISDN/dsp_core.c
index a61b505..468bfe1 100644
--- a/drivers/isdn/hardware/mISDN/dsp_core.c
+++ b/drivers/isdn/hardware/mISDN/dsp_core.c
@@ -802,7 +802,7 @@ static int dsp_init(void)
 	/* fill mISDN object (dsp_obj) */
 	memset(&dsp_obj, 0, sizeof(dsp_obj));
 #ifdef MODULE
-	SET_MODULE_OWNER(&dsp_obj);
+	dsp_obj.owner = THIS_MODULE;
 #endif
 	dsp_obj.name = DSPName;
 	dsp_obj.BPROTO.protocol[3] = ISDN_PID_L3_B_DSP;
diff --git a/drivers/isdn/hardware/mISDN/dtmf.c b/drivers/isdn/hardware/mISDN/dtmf.c
index c12e867..85265f3 100644
--- a/drivers/isdn/hardware/mISDN/dtmf.c
+++ b/drivers/isdn/hardware/mISDN/dtmf.c
@@ -610,7 +610,9 @@ static int dtmf_init(void)
 	int err;
 
 	printk(KERN_INFO "DTMF modul version %s\n", mISDN_getrev(mISDN_dtmf_revision));
-	SET_MODULE_OWNER(&dtmf_obj);
+#ifdef MODULE
+	dtmf_obj.owner = THIS_MODULE;
+#endif
 	dtmf_obj.name = MName;
 	dtmf_obj.BPROTO.protocol[2] = ISDN_PID_L2_B_TRANSDTMF;
 	dtmf_obj.own_ctrl = dtmf_manager;
diff --git a/drivers/isdn/hardware/mISDN/hfc_pci.c b/drivers/isdn/hardware/mISDN/hfc_pci.c
index 1e99271..48dbf12 100644
--- a/drivers/isdn/hardware/mISDN/hfc_pci.c
+++ b/drivers/isdn/hardware/mISDN/hfc_pci.c
@@ -2365,7 +2365,9 @@ static int __init HFC_init(void)
 	mISDN_pid_t	pid;
 	mISDNstack_t	*dst;
 
-	SET_MODULE_OWNER(&HFC_obj);
+#ifdef MODULE
+	HFC_obj.owner = THIS_MODULE;
+#endif
 	HFC_obj.name = HFCName;
 	HFC_obj.own_ctrl = HFC_manager;
 	HFC_obj.DPROTO.protocol[0] = ISDN_PID_L0_TE_S0 |
diff --git a/drivers/isdn/hardware/mISDN/i4l_mISDN.c b/drivers/isdn/hardware/mISDN/i4l_mISDN.c
index d5864f4..adf21f8 100644
--- a/drivers/isdn/hardware/mISDN/i4l_mISDN.c
+++ b/drivers/isdn/hardware/mISDN/i4l_mISDN.c
@@ -1530,7 +1530,9 @@ I4Lcapi_init(void)
 	int err;
 
 	printk(KERN_INFO "I4L CAPI interface modul version %s\n", mISDN_getrev(i4lcapi_revision));
-	SET_MODULE_OWNER(&I4Lcapi);
+#ifdef MODULE
+	I4Lcapi.owner = THIS_MODULE;
+#endif
 	I4Lcapi.name = I4L_capi_name;
 	I4Lcapi.own_ctrl = I4Lcapi_manager;
 	I4Lcapi.DPROTO.protocol[0] = ISDN_PID_L0_TE_S0;
diff --git a/drivers/isdn/hardware/mISDN/l3_udss1.c b/drivers/isdn/hardware/mISDN/l3_udss1.c
index 2b90258..8cdcc46 100644
--- a/drivers/isdn/hardware/mISDN/l3_udss1.c
+++ b/drivers/isdn/hardware/mISDN/l3_udss1.c
@@ -2397,7 +2397,9 @@ int UDSS1Init(void)
 
 	strcpy(tmp, dss1_revision);
 	printk(KERN_INFO "mISDN: DSS1 Rev. %s\n", mISDN_getrev(tmp));
-	SET_MODULE_OWNER(&u_dss1);
+#ifdef MODULE
+	u_dss1.owner = THIS_MODULE;
+#endif
 	u_dss1.name = MName;
 	u_dss1.DPROTO.protocol[3] = ISDN_PID_L3_DSS1USER |
 		ISDN_PID_L3_DF_PTP |
diff --git a/drivers/isdn/hardware/mISDN/layer1.c b/drivers/isdn/hardware/mISDN/layer1.c
index ee514f4..cf76ab0 100644
--- a/drivers/isdn/hardware/mISDN/layer1.c
+++ b/drivers/isdn/hardware/mISDN/layer1.c
@@ -766,7 +766,9 @@ int Isdnl1Init(void)
 	int err;
 
 	printk(KERN_INFO "ISDN L1 driver version %s\n", mISDN_getrev(l1_revision));
-	SET_MODULE_OWNER(&isdnl1);
+#ifdef MODULE
+	isdnl1.owner = THIS_MODULE;
+#endif
 	isdnl1.name = MName;
 	isdnl1.DPROTO.protocol[1] = ISDN_PID_L1_TE_S0;
 	isdnl1.own_ctrl = l1_manager;
diff --git a/drivers/isdn/hardware/mISDN/layer2.c b/drivers/isdn/hardware/mISDN/layer2.c
index dfa65bc..b8a57f5 100644
--- a/drivers/isdn/hardware/mISDN/layer2.c
+++ b/drivers/isdn/hardware/mISDN/layer2.c
@@ -2414,7 +2414,9 @@ int Isdnl2_Init(void)
 	int err;
 
 	printk(KERN_INFO "ISDN L2 driver version %s\n", mISDN_getrev(l2_revision));
-	SET_MODULE_OWNER(&isdnl2);
+#ifdef MODULE
+	isdnl2.owner = THIS_MODULE;
+#endif
 	isdnl2.name = MName;
 	isdnl2.DPROTO.protocol[2] = ISDN_PID_L2_LAPD |
 		ISDN_PID_L2_LAPD_NET |
diff --git a/drivers/isdn/hardware/mISDN/sedl_fax.c b/drivers/isdn/hardware/mISDN/sedl_fax.c
index f4c9263..762421d 100644
--- a/drivers/isdn/hardware/mISDN/sedl_fax.c
+++ b/drivers/isdn/hardware/mISDN/sedl_fax.c
@@ -792,7 +792,9 @@ static int __init Speedfax_init(void)
 	sedl_fax *card;
 	mISDN_pid_t pid;
 
-	SET_MODULE_OWNER(&speedfax);
+#ifdef MODULE
+	speedfax.owner = THIS_MODULE;
+#endif
 	speedfax.name = SpeedfaxName;
 	speedfax.own_ctrl = speedfax_manager;
 	speedfax.DPROTO.protocol[0] = ISDN_PID_L0_TE_S0;
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index e498b19..0f56f4c 100755
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -1529,7 +1529,9 @@ static int __init w6692_init(void)
 
 	printk(KERN_INFO "Winbond W6692 PCI driver Rev. %s\n", mISDN_getrev(w6692_rev));
 
-	SET_MODULE_OWNER(&w6692);
+#ifdef MODULE
+	w6692.owner = THIS_MODULE;
+#endif
 	w6692.name = W6692Name;
 	w6692.own_ctrl = w6692_manager;
 	w6692.DPROTO.protocol[0] = ISDN_PID_L0_TE_S0;
diff --git a/drivers/isdn/hardware/mISDN/x25_dte.c b/drivers/isdn/hardware/mISDN/x25_dte.c
index 2dfaf47..379113c 100644
--- a/drivers/isdn/hardware/mISDN/x25_dte.c
+++ b/drivers/isdn/hardware/mISDN/x25_dte.c
@@ -1310,7 +1310,9 @@ x25_dte_init(void)
 	int err;
 
 	printk(KERN_INFO "X25 DTE modul version %s\n", mISDN_getrev(mISDN_dte_revision));
-	SET_MODULE_OWNER(&x25dte_obj);
+#ifdef MODULE
+	x25dte_obj.owner = THIS_MODULE;
+#endif
 	x25dte_obj.name = MName;
 	x25dte_obj.BPROTO.protocol[3] = ISDN_PID_L3_B_X25DTE;
 	x25dte_obj.own_ctrl = dte_manager;