diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-20 16:11:27 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-20 16:11:27 -0800 |
| commit | 21c91e6108f4e437d99dd3b7eaf4e79bf8f49688 (patch) | |
| tree | 58c2a7bbdf2f0813614a620b6c4a9770f64a6bc2 /driver | |
| parent | b94f62772b7491873cb24026b92381c631c02b25 (diff) | |
| download | patches-21c91e6108f4e437d99dd3b7eaf4e79bf8f49688.tar.gz | |
ib sysfs fixup patch
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/drm-classdev-cleanup.patch | 2 | ||||
| -rw-r--r-- | driver/ib-sysfs-cleanup.patch | 53 |
2 files changed, 54 insertions, 1 deletions
diff --git a/driver/drm-classdev-cleanup.patch b/driver/drm-classdev-cleanup.patch index b68d15cce23c0..4d65cf5553737 100644 --- a/driver/drm-classdev-cleanup.patch +++ b/driver/drm-classdev-cleanup.patch @@ -11,7 +11,7 @@ core can do all of this work automatically for you. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - +--- drivers/char/drm/drmP.h | 10 +-- drivers/char/drm/drm_stub.c | 2 drivers/char/drm/drm_sysfs.c | 129 +++++++++---------------------------------- diff --git a/driver/ib-sysfs-cleanup.patch b/driver/ib-sysfs-cleanup.patch new file mode 100644 index 0000000000000..e391f706ecc80 --- /dev/null +++ b/driver/ib-sysfs-cleanup.patch @@ -0,0 +1,53 @@ +From foo@baz.org Sun Jun 5 14:33:21 2005 +Date: Fri, 20 Jan 2006 14:08:59 -0800 +To: Greg KH <gregkh@suse.de> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: IB: fix up major/minor sysfs interface for IB core + +Current IB code doesn't work with userspace programs that listen only to +the kernel event netlink socket as it is trying to create its own dev +interface. This small patch fixes this problem, and removes some +unneeded code as the driver core handles this logic for you +automatically. + +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/infiniband/core/ucm.c | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +--- gregkh-2.6.orig/drivers/infiniband/core/ucm.c ++++ gregkh-2.6/drivers/infiniband/core/ucm.c +@@ -1319,15 +1319,6 @@ static struct class ucm_class = { + .release = ib_ucm_release_class_dev + }; + +-static ssize_t show_dev(struct class_device *class_dev, char *buf) +-{ +- struct ib_ucm_device *dev; +- +- dev = container_of(class_dev, struct ib_ucm_device, class_dev); +- return print_dev_t(buf, dev->dev.dev); +-} +-static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL); +- + static ssize_t show_ibdev(struct class_device *class_dev, char *buf) + { + struct ib_ucm_device *dev; +@@ -1364,15 +1355,13 @@ static void ib_ucm_add_one(struct ib_dev + + ucm_dev->class_dev.class = &ucm_class; + ucm_dev->class_dev.dev = device->dma_device; ++ ucm_dev->class_dev.devt = ucm_dev->dev.dev; + snprintf(ucm_dev->class_dev.class_id, BUS_ID_SIZE, "ucm%d", + ucm_dev->devnum); + if (class_device_register(&ucm_dev->class_dev)) + goto err_cdev; + + if (class_device_create_file(&ucm_dev->class_dev, +- &class_device_attr_dev)) +- goto err_class; +- if (class_device_create_file(&ucm_dev->class_dev, + &class_device_attr_ibdev)) + goto err_class; + |