[svn-commits] tzafrir: branch linux/tzafrir/sysfs r8610 - /linux/team/tzafrir/sysfs/drivers...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed May  5 04:46:03 2010
New Revision: 8610

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8610
Log:
xpp: remove '!<hardware_port>' from location and connector

Modified:
    linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c

Modified: linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c?view=diff&rev=8610&r1=8609&r2=8610
==============================================================================
--- linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c (original)
+++ linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c Wed May  5 04:46:03 2010
@@ -1112,12 +1112,12 @@
 		"Astribank: Unit %x Subunit %x: %s",
 		XBUS_UNIT(xpd->xbus_idx), XBUS_SUBUNIT(xpd->xbus_idx),
 		xpd->type_name);
-	/* The location is: <Connector>!<XPD-Number> */
-	snprintf(span->location, sizeof(span->location) - 1, "%s!%d%d",
-			xbus->connector, xpd->addr.unit, xpd->addr.subunit);
-	/* The hardware_id is: <Label>!<XPD-Number> */
-	snprintf(span->hardware_id, sizeof(span->hardware_id) - 1, "%s!%d%d",
-			xbus->label, xpd->addr.unit, xpd->addr.subunit);
+	/* The location is: <Connector> */
+	snprintf(span->location, sizeof(span->location) - 1, "%s",
+			xbus->connector);
+	/* The hardware_id is: <Label> */
+	snprintf(span->hardware_id, sizeof(span->hardware_id) - 1, "%s",
+			xbus->label);
 	span->hardware_port = xpd->addr.unit * 10 + xpd->addr.subunit;
 	/*
 	 * Who said a span and irq have 1-1 relationship?