diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-05-27 13:15:29 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-05-27 13:15:29 +0000 |
| commit | 15cb848eadd51323f34df76c8752dbd580f267a6 (patch) | |
| tree | 1c3dc3b7d2a3e8daeaddb735906c0ac3acdddddf /kernel/xpp/xdefs.h | |
| parent | 1a5c5df3dd49acdda584802aa1b7e0cc32476066 (diff) | |
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
Diffstat (limited to 'kernel/xpp/xdefs.h')
| -rw-r--r-- | kernel/xpp/xdefs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/xpp/xdefs.h b/kernel/xpp/xdefs.h index 1aadbe5..f3d5b58 100644 --- a/kernel/xpp/xdefs.h +++ b/kernel/xpp/xdefs.h @@ -143,6 +143,12 @@ typedef unsigned char byte; #define DRIVER_ATTR_READER(name,drv,buf) \ ssize_t name(struct device_driver *drv, char * buf) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) +#define dev_name(dev) (dev)->bus_id +#define dev_set_name(dev, format, ...) \ + snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__); +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) /* Also don't define this for later RHEL >= 5.2 . hex_asc is from the * same linux-2.6-net-infrastructure-updates-to-mac80211-iwl4965.patch |