'atomic_read()' -> refcount_read()'
The upstream 4.11 kernel, in commit (10383aea2f445bce9b2a2b308def08134b438c8e "kref: Implement 'struct kref' using refcount_t"), changed refcount type on kref objects. We now need to use refcount_read to read them. Signed-off-by: Shaun Ruffell <sruffell@digium.com>
This commit is contained in:
committed by
Tzafrir Cohen
parent
ff88ccb1cd
commit
0159b0e7ce
@@ -467,7 +467,7 @@ static int _destroy_dynamic(struct dahdi_dynamic_span *dds)
|
||||
|
||||
/* We shouldn't have more than the two references at this point. If
|
||||
* we do, there are probably channels that are still opened. */
|
||||
if (atomic_read(&d->kref.refcount) > 2) {
|
||||
if (refcount_read(&d->kref.refcount) > 2) {
|
||||
dynamic_put(d);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
@@ -244,7 +244,7 @@ int refcount_xbus(xbus_t *xbus)
|
||||
{
|
||||
struct kref *kref = &xbus->kref;
|
||||
|
||||
return atomic_read(&kref->refcount);
|
||||
return refcount_read(&kref->refcount);
|
||||
}
|
||||
|
||||
/*------------------------- Frame Handling ------------------------*/
|
||||
|
||||
@@ -1000,7 +1000,7 @@ void xbus_sysfs_remove(xbus_t *xbus)
|
||||
return;
|
||||
}
|
||||
XBUS_DBG(DEVICES, xbus, "going to unregister: refcount=%d\n",
|
||||
atomic_read(&astribank->kobj.kref.refcount));
|
||||
refcount_read(&astribank->kobj.kref.refcount));
|
||||
BUG_ON(dev_get_drvdata(astribank) != xbus);
|
||||
device_unregister(astribank);
|
||||
dev_set_drvdata(astribank, NULL);
|
||||
|
||||
@@ -124,7 +124,7 @@ int refcount_xpd(xpd_t *xpd)
|
||||
{
|
||||
struct kref *kref = &xpd->kref;
|
||||
|
||||
return atomic_read(&kref->refcount);
|
||||
return refcount_read(&kref->refcount);
|
||||
}
|
||||
|
||||
xpd_t *get_xpd(const char *msg, xpd_t *xpd)
|
||||
|
||||
Reference in New Issue
Block a user