diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-09-28 08:57:07 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-09-28 08:57:07 +0000 |
| commit | 1d30081bd5314876b0036ceabb19df725ca02696 (patch) | |
| tree | faf8906e2791750f452d2d7d2dc0e74a8d7b7e45 /drivers/dahdi/xpp/xbus-sysfs.c | |
| parent | 2cfa254d7bce9ca28a4c98ba858612050e9fe153 (diff) | |
xpp: Use proper get/set for device->driver_data
2.6.32-rc1 broke direct access to the member 'driver_data' of 'struct
device'. However direct access to wasn't proper in the first place.
This commit replaces direct access to dev->driver_data with
dev_get_drvdata() and dev_set_drvdata().
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7226 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/xbus-sysfs.c')
| -rw-r--r-- | drivers/dahdi/xpp/xbus-sysfs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c index 7f570ea..df9f49a 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c @@ -707,7 +707,7 @@ int xpd_device_register(xbus_t *xbus, xpd_t *xpd) dev->parent = &xbus->astribank; dev_set_name(dev, "%02d:%1x:%1x", xbus->num, xpd->addr.unit, xpd->addr.subunit); - dev->driver_data = xpd; + dev_set_drvdata(dev, xpd); dev->release = xpd_release; ret = device_register(dev); if(ret) { @@ -728,11 +728,11 @@ void xpd_device_unregister(xpd_t *xpd) BUG_ON(!xbus); XPD_DBG(DEVICES, xpd, "SYSFS\n"); dev = &xpd->xpd_dev; - if(!dev->driver_data) + if(!dev_get_drvdata(dev)) return; - BUG_ON(dev->driver_data != xpd); + BUG_ON(dev_get_drvdata(dev) != xpd); device_unregister(dev); - dev->driver_data = NULL; + dev_set_drvdata(dev, NULL); } /*--------- Sysfs Device handling ----*/ @@ -746,9 +746,9 @@ void xbus_sysfs_remove(xbus_t *xbus) astribank = &xbus->astribank; BUG_ON(!astribank); sysfs_remove_link(&astribank->kobj, "transport"); - if(!astribank->driver_data) + if(!dev_get_drvdata(astribank)) return; - BUG_ON(astribank->driver_data != xbus); + BUG_ON(dev_get_drvdata(astribank) != xbus); device_unregister(&xbus->astribank); } @@ -764,18 +764,18 @@ int xbus_sysfs_create(xbus_t *xbus) astribank->bus = &toplevel_bus_type; astribank->parent = xbus->transport.transport_device; dev_set_name(astribank, "xbus-%02d", xbus->num); - astribank->driver_data = xbus; + dev_set_drvdata(astribank, xbus); astribank->release = astribank_release; ret = device_register(astribank); if(ret) { XBUS_ERR(xbus, "%s: device_register failed: %d\n", __FUNCTION__, ret); - astribank->driver_data = NULL; + dev_set_drvdata(astribank, NULL); goto out; } ret = sysfs_create_link(&astribank->kobj, &astribank->parent->kobj, "transport"); if(ret < 0) { XBUS_ERR(xbus, "%s: sysfs_create_link failed: %d\n", __FUNCTION__, ret); - astribank->driver_data = NULL; + dev_set_drvdata(astribank, NULL); goto out; } out: |