[svn-commits] fjoe: freebsd/trunk r10471 - in /freebsd/trunk: bsd-kmod/dahdi/ drivers/dahdi...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Feb 26 15:01:03 CST 2012
Author: fjoe
Date: Sun Feb 26 15:00:59 2012
New Revision: 10471
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10471
Log:
_linux_module_usecount() -> module_refcount()
Modified:
freebsd/trunk/bsd-kmod/dahdi/bsd-compat.c
freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
freebsd/trunk/drivers/dahdi/wcfxo.c
freebsd/trunk/drivers/dahdi/wct4xxp/base.c
freebsd/trunk/drivers/dahdi/wctc4xxp/base.c
freebsd/trunk/drivers/dahdi/wctdm.c
freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c
freebsd/trunk/drivers/dahdi/wcte11xp.c
freebsd/trunk/drivers/dahdi/wcte12xp/base.c
freebsd/trunk/include/linux/module.h
Modified: freebsd/trunk/bsd-kmod/dahdi/bsd-compat.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/bsd-kmod/dahdi/bsd-compat.c?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/bsd-kmod/dahdi/bsd-compat.c (original)
+++ freebsd/trunk/bsd-kmod/dahdi/bsd-compat.c Sun Feb 26 15:00:59 2012
@@ -363,7 +363,7 @@
}
int
-_linux_module_usecount(struct module *m)
+module_refcount(struct module *m)
{
return atomic_read(&m->refcount);
}
@@ -384,7 +384,7 @@
m->exit();
return (0);
case MOD_QUIESCE:
- if (_linux_module_usecount(m) > 0)
+ if (module_refcount(m) > 0)
return (EBUSY);
return (0);
default:
Modified: freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wcb4xxp/base.c Sun Feb 26 15:00:59 2012
@@ -3124,7 +3124,7 @@
{
struct b4xxp *b4 = device_get_softc(dev);
- if (_linux_module_usecount(THIS_MODULE) > 0)
+ if (module_refcount(THIS_MODULE) > 0)
return (EBUSY);
/* unregister */
Modified: freebsd/trunk/drivers/dahdi/wcfxo.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcfxo.c?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcfxo.c (original)
+++ freebsd/trunk/drivers/dahdi/wcfxo.c Sun Feb 26 15:00:59 2012
@@ -1289,7 +1289,7 @@
{
struct wcfxo *wc = device_get_softc(dev);
- if (_linux_module_usecount(THIS_MODULE) > 0)
+ if (module_refcount(THIS_MODULE) > 0)
return (EBUSY);
/* Stop any DMA */
Modified: freebsd/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wct4xxp/base.c Sun Feb 26 15:00:59 2012
@@ -5092,7 +5092,7 @@
{
struct t4 *wc = device_get_softc(dev);
- if (_linux_module_usecount(THIS_MODULE) > 0)
+ if (module_refcount(THIS_MODULE) > 0)
return (EBUSY);
/* unregister */
Modified: freebsd/trunk/drivers/dahdi/wctc4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/drivers/dahdi/wctc4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wctc4xxp/base.c Sun Feb 26 15:00:59 2012
@@ -4214,7 +4214,7 @@
static int
wctc4xxp_device_detach(device_t dev)
{
- if (_linux_module_usecount(THIS_MODULE) > 0)
+ if (module_refcount(THIS_MODULE) > 0)
return (EBUSY);
wctc4xxp_remove_one(dev);
Modified: freebsd/trunk/drivers/dahdi/wctdm.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wctdm.c?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/drivers/dahdi/wctdm.c (original)
+++ freebsd/trunk/drivers/dahdi/wctdm.c Sun Feb 26 15:00:59 2012
@@ -3065,7 +3065,7 @@
{
struct wctdm *wc = device_get_softc(dev);
- if (_linux_module_usecount(THIS_MODULE) > 0)
+ if (module_refcount(THIS_MODULE) > 0)
return (EBUSY);
/* Stop any DMA */
Modified: freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c Sun Feb 26 15:00:59 2012
@@ -5463,7 +5463,7 @@
static int
wctdm_device_detach(device_t dev)
{
- if (_linux_module_usecount(THIS_MODULE) > 0)
+ if (module_refcount(THIS_MODULE) > 0)
return (EBUSY);
wctdm_remove_one(dev);
Modified: freebsd/trunk/drivers/dahdi/wcte11xp.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcte11xp.c?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcte11xp.c (original)
+++ freebsd/trunk/drivers/dahdi/wcte11xp.c Sun Feb 26 15:00:59 2012
@@ -1813,7 +1813,7 @@
{
struct t1 *wc = device_get_softc(dev);
- if (_linux_module_usecount(THIS_MODULE) > 0)
+ if (module_refcount(THIS_MODULE) > 0)
return (EBUSY);
/* Stop any DMA */
Modified: freebsd/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wcte12xp/base.c Sun Feb 26 15:00:59 2012
@@ -2502,7 +2502,7 @@
static int
te12xp_device_detach(device_t dev)
{
- if (_linux_module_usecount(THIS_MODULE) > 0)
+ if (module_refcount(THIS_MODULE) > 0)
return (EBUSY);
te12xp_remove_one(dev);
Modified: freebsd/trunk/include/linux/module.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/include/linux/module.h?view=diff&rev=10471&r1=10470&r2=10471
==============================================================================
--- freebsd/trunk/include/linux/module.h (original)
+++ freebsd/trunk/include/linux/module.h Sun Feb 26 15:00:59 2012
@@ -28,8 +28,6 @@
const void **pfield;
void *value;
};
-
-int _linux_module_usecount(struct module *);
int _linux_module_modevent(struct module *mod, int type, void *data);
@@ -66,6 +64,7 @@
int try_module_get(struct module *);
void module_put(struct module *);
+int module_refcount(struct module *);
#define EXPORT_SYMBOL(s)
#define EXPORT_SYMBOL_GPL(s)
More information about the svn-commits
mailing list