From 15cb848eadd51323f34df76c8752dbd580f267a6 Mon Sep 17 00:00:00 2001 From: tzafrir Date: Wed, 27 May 2009 13:15:29 +0000 Subject: xpp: Replaece member bus_id with dev_name() and set_dev_name() As of 2.6.26 the macros dev_name() and set_dev_name() are used to read and set (respectively) the bus_id member in sysfs. As of 2.6.30 bus_id is gone. This patch provides comaptiobility macros for older kernel versions and removes direct usage of bus_id. From dahdi-linux r6637. Regarding issue #14965 . git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4649 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- kernel/xpp/card_fxs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/xpp/card_fxs.c') diff --git a/kernel/xpp/card_fxs.c b/kernel/xpp/card_fxs.c index 450539a..7a0e293 100644 --- a/kernel/xpp/card_fxs.c +++ b/kernel/xpp/card_fxs.c @@ -1504,7 +1504,7 @@ static int fxs_xpd_probe(struct device *dev) /* Is it our device? */ if(xpd->type != XPD_TYPE_FXS) { XPD_ERR(xpd, "drop suggestion for %s (%d)\n", - dev->bus_id, xpd->type); + dev_name(dev), xpd->type); return -EINVAL; } XPD_DBG(DEVICES, xpd, "SYSFS\n"); -- cgit v1.2.3