diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-11-05 12:06:34 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-11-05 12:06:34 +0000 |
commit | 0ee3bc8670599c0dfce468f33a4082818f9343db (patch) | |
tree | 2970f9cc620b780c460394a60e349dacb8348881 | |
parent | 2894bcf9effd6960bd1bf5054d2c4817f501d67c (diff) |
backport a number of build fixes from trunk to 2.2
Merged revisions 7226,7356,7392 via svnmerge from
http://svn.digium.com/svn/dahdi/linux/trunk
........
r7226 | tzafrir | 2009-09-28 10:57:07 +0200 (Mon, 28 Sep 2009) | 8 lines
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().
........
r7356 | sruffell | 2009-10-09 07:22:55 +0200 (Fri, 09 Oct 2009) | 6 lines
dahdi-base: Include linux/sched.h
Commit a99bba to the mainline kernel removed sched.h from poll.h. So
dahdi-base.c needs to include sched.h directly now.
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a99bba
........
r7392 | sruffell | 2009-10-12 22:05:35 +0200 (Mon, 12 Oct 2009) | 4 lines
headers: sched.h was also removed from interrupts.h
Commit d43c36 made it necessary to add sched.h to more of the board drivers.
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d43c36
........
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@7493 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/dahdi-base.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/pciradio.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wctdm.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xbus-core.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xbus-sysfs.c | 18 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 1 |
7 files changed, 15 insertions, 9 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 9fa0ef0..cb1b1c1 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -45,6 +45,7 @@ #include <linux/ctype.h> #include <linux/kmod.h> #include <linux/moduleparam.h> +#include <linux/sched.h> #include <linux/list.h> #include <linux/ppp_defs.h> diff --git a/drivers/dahdi/pciradio.c b/drivers/dahdi/pciradio.c index 6b64e7e..c3024e0 100644 --- a/drivers/dahdi/pciradio.c +++ b/drivers/dahdi/pciradio.c @@ -51,6 +51,7 @@ With driver: 303826 (1.5 %) #include <linux/pci.h> #include <linux/interrupt.h> #include <linux/moduleparam.h> +#include <linux/sched.h> #include <asm/io.h> #include <asm/delay.h> diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c index d6722a8..84f074f 100644 --- a/drivers/dahdi/wctdm.c +++ b/drivers/dahdi/wctdm.c @@ -31,6 +31,7 @@ #include <linux/pci.h> #include <linux/interrupt.h> #include <linux/moduleparam.h> +#include <linux/sched.h> #include <asm/io.h> #include "proslic.h" diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index f26fb9a..7f68473 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -41,6 +41,7 @@ Tx Gain - W/Pre-Emphasis: -23.99 to 0.00 db #include <linux/init.h> #include <linux/errno.h> #include <linux/pci.h> +#include <linux/sched.h> #include <linux/interrupt.h> #include <linux/workqueue.h> #include <linux/delay.h> diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index 23d997a..40d127b 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -28,6 +28,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/errno.h> +#include <linux/sched.h> #include <linux/proc_fs.h> #ifdef PROTOCOL_DEBUG #include <linux/ctype.h> diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c index 3f3aa25..35895ca 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c @@ -724,7 +724,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) { @@ -745,11 +745,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 ----*/ @@ -763,9 +763,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); } @@ -781,18 +781,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: diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 33fb137..88887e5 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -31,6 +31,7 @@ #endif #include <linux/kernel.h> +#include <linux/sched.h> #include <linux/errno.h> #include <linux/module.h> #include <linux/device.h> |