[svn-commits] tzafrir: branch linux/2.2 r7493 - in /linux/branches/2.2: ./ drivers/dahdi/ d...

Thu Nov 5 06:06:39 CST 2009

Author: tzafrir
Date: Thu Nov  5 06:06:34 2009
New Revision: 7493

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7493
Log:
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
........

Modified:
    linux/branches/2.2/   (props changed)
    linux/branches/2.2/drivers/dahdi/dahdi-base.c
    linux/branches/2.2/drivers/dahdi/pciradio.c
    linux/branches/2.2/drivers/dahdi/wctdm.c
    linux/branches/2.2/drivers/dahdi/wctdm24xxp/base.c
    linux/branches/2.2/drivers/dahdi/xpp/xbus-core.c
    linux/branches/2.2/drivers/dahdi/xpp/xbus-sysfs.c
    linux/branches/2.2/drivers/dahdi/xpp/xpp_dahdi.c

Propchange: linux/branches/2.2/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: linux/branches/2.2/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/dahdi-base.c?view=diff&rev=7493&r1=7492&r2=7493
==============================================================================

--- linux/branches/2.2/drivers/dahdi/dahdi-base.c (original)
+++ linux/branches/2.2/drivers/dahdi/dahdi-base.c Thu Nov  5 06:06:34 2009
@@ -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>

Modified: linux/branches/2.2/drivers/dahdi/pciradio.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/pciradio.c?view=diff&rev=7493&r1=7492&r2=7493
==============================================================================
--- linux/branches/2.2/drivers/dahdi/pciradio.c (original)
+++ linux/branches/2.2/drivers/dahdi/pciradio.c Thu Nov  5 06:06:34 2009
@@ -51,6 +51,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/moduleparam.h>
+#include <linux/sched.h>
 #include <asm/io.h>
 #include <asm/delay.h> 
 

Modified: linux/branches/2.2/drivers/dahdi/wctdm.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/wctdm.c?view=diff&rev=7493&r1=7492&r2=7493
==============================================================================
--- linux/branches/2.2/drivers/dahdi/wctdm.c (original)
+++ linux/branches/2.2/drivers/dahdi/wctdm.c Thu Nov  5 06:06:34 2009
@@ -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"
 

Modified: linux/branches/2.2/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=7493&r1=7492&r2=7493
==============================================================================
--- linux/branches/2.2/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/branches/2.2/drivers/dahdi/wctdm24xxp/base.c Thu Nov  5 06:06:34 2009
@@ -41,6 +41,7 @@
 #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>

Modified: linux/branches/2.2/drivers/dahdi/xpp/xbus-core.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/xpp/xbus-core.c?view=diff&rev=7493&r1=7492&r2=7493
==============================================================================
--- linux/branches/2.2/drivers/dahdi/xpp/xbus-core.c (original)
+++ linux/branches/2.2/drivers/dahdi/xpp/xbus-core.c Thu Nov  5 06:06:34 2009
@@ -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>

Modified: linux/branches/2.2/drivers/dahdi/xpp/xbus-sysfs.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/xpp/xbus-sysfs.c?view=diff&rev=7493&r1=7492&r2=7493
==============================================================================
--- linux/branches/2.2/drivers/dahdi/xpp/xbus-sysfs.c (original)
+++ linux/branches/2.2/drivers/dahdi/xpp/xbus-sysfs.c Thu Nov  5 06:06:34 2009
@@ -724,7 +724,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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:

Modified: linux/branches/2.2/drivers/dahdi/xpp/xpp_dahdi.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/xpp/xpp_dahdi.c?view=diff&rev=7493&r1=7492&r2=7493
==============================================================================
--- linux/branches/2.2/drivers/dahdi/xpp/xpp_dahdi.c (original)
+++ linux/branches/2.2/drivers/dahdi/xpp/xpp_dahdi.c Thu Nov  5 06:06:34 2009
@@ -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>


