From ccfc59e0b37f3ec1ad0d4dbe6d228ffdad159e60 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Wed, 27 May 2009 12:48:09 +0000 Subject: xpp: Fix more 'owner' for 2.6.30 to be happy. Finishing the work of r6642. Complitly shut issue #14964. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6659 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/xpp/card_bri.c | 2 +- drivers/dahdi/xpp/card_fxo.c | 4 ++-- drivers/dahdi/xpp/card_fxs.c | 4 ++-- drivers/dahdi/xpp/card_global.c | 2 +- drivers/dahdi/xpp/card_pri.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index fb5fdd2..a749f9d 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -799,7 +799,7 @@ static int bri_proc_create(xbus_t *xbus, xpd_t *xpd) XPD_ERR(xpd, "Failed to create proc file '%s'\n", PROC_BRI_INFO_FNAME); goto err; } - priv->bri_info->owner = THIS_MODULE; + SET_PROC_DIRENTRY_OWNER(priv->bri_info); #endif return 0; err: diff --git a/drivers/dahdi/xpp/card_fxo.c b/drivers/dahdi/xpp/card_fxo.c index 9e618a6..b06fb3b 100644 --- a/drivers/dahdi/xpp/card_fxo.c +++ b/drivers/dahdi/xpp/card_fxo.c @@ -405,7 +405,7 @@ static int fxo_proc_create(xbus_t *xbus, xpd_t *xpd) XPD_ERR(xpd, "Failed to create proc file '%s'\n", PROC_FXO_INFO_FNAME); goto err; } - priv->fxo_info->owner = THIS_MODULE; + SET_PROC_DIRENTRY_OWNER(priv->fxo_info); #ifdef WITH_METERING XPD_DBG(PROC, xpd, "Creating Metering tone file\n"); priv->meteringfile = create_proc_read_entry(PROC_METERING_FNAME, 0444, xpd->proc_xpd_dir, @@ -414,7 +414,7 @@ static int fxo_proc_create(xbus_t *xbus, xpd_t *xpd) XPD_ERR(xpd, "Failed to create proc file '%s'\n", PROC_METERING_FNAME); goto err; } - priv->meteringfile->owner = THIS_MODULE; + SET_PROC_DIRENTRY_OWNER(priv->meteringfile); #endif #endif return 0; diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c index 0aee211..26ba327 100644 --- a/drivers/dahdi/xpp/card_fxs.c +++ b/drivers/dahdi/xpp/card_fxs.c @@ -358,7 +358,7 @@ static int fxs_proc_create(xbus_t *xbus, xpd_t *xpd) XPD_ERR(xpd, "Failed to create proc file '%s'\n", PROC_FXS_INFO_FNAME); goto err; } - priv->fxs_info->owner = THIS_MODULE; + SET_PROC_DIRENTRY_OWNER(priv->fxs_info); #ifdef WITH_METERING XPD_DBG(PROC, xpd, "Creating Metering tone file\n"); priv->meteringfile = create_proc_entry(PROC_METERING_FNAME, 0200, xpd->proc_xpd_dir); @@ -366,7 +366,7 @@ static int fxs_proc_create(xbus_t *xbus, xpd_t *xpd) XPD_ERR(xpd, "Failed to create proc file '%s'\n", PROC_METERING_FNAME); goto err; } - priv->meteringfile->owner = THIS_MODULE; + SET_PROC_DIRENTRY_OWNER(priv->meteringfile); priv->meteringfile->write_proc = proc_xpd_metering_write; priv->meteringfile->read_proc = NULL; priv->meteringfile->data = xpd; diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c index c364dae..6292e71 100644 --- a/drivers/dahdi/xpp/card_global.c +++ b/drivers/dahdi/xpp/card_global.c @@ -402,7 +402,7 @@ int chip_proc_create(xbus_t *xbus, xpd_t *xpd) XPD_ERR(xpd, "Failed to create proc file '%s'\n", CHIP_REGISTERS); goto err; } - xpd->proc_xpd_chipregs->owner = THIS_MODULE; + SET_PROC_DIRENTRY_OWNER(priv->proc_xpd_chipregs); xpd->proc_xpd_chipregs->write_proc = proc_xpd_register_write; xpd->proc_xpd_chipregs->read_proc = proc_xpd_register_read; xpd->proc_xpd_chipregs->data = xpd; diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c index 2c8d318..93b43b0 100644 --- a/drivers/dahdi/xpp/card_pri.c +++ b/drivers/dahdi/xpp/card_pri.c @@ -421,7 +421,7 @@ static int pri_proc_create(xbus_t *xbus, xpd_t *xpd) XPD_ERR(xpd, "Failed to create proc '%s'\n", PROC_PRI_INFO_FNAME); goto err; } - priv->pri_info->owner = THIS_MODULE; + SET_PROC_DIRENTRY_OWNER(priv->pri_info); priv->pri_info->write_proc = proc_pri_info_write; priv->pri_info->read_proc = proc_pri_info_read; priv->pri_info->data = xpd; -- cgit v1.2.3