diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 10:43:03 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 10:43:03 -0800 |
| commit | 8fc479a8258f7be5aa4bb7036c8752bfd8743874 (patch) | |
| tree | 8f016cda03a726ce4619dff39e98200accc4f75c /pending | |
| parent | f66cb622b9a7c33b7326ae775a3d5f57ebdf7686 (diff) | |
| download | patches-8fc479a8258f7be5aa4bb7036c8752bfd8743874.tar.gz | |
2.6.24-git10 resync and coding style issues for usb added
Diffstat (limited to 'pending')
| -rw-r--r-- | pending/f1.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/pending/f1.patch b/pending/f1.patch new file mode 100644 index 00000000000000..00c882dcf223fa --- /dev/null +++ b/pending/f1.patch @@ -0,0 +1,66 @@ +--- + drivers/net/ehea/ehea_main.c | 37 ------------------------------------- + 1 file changed, 37 deletions(-) + +--- a/drivers/net/ehea/ehea_main.c ++++ b/drivers/net/ehea/ehea_main.c +@@ -2804,34 +2804,6 @@ static void __devinit logical_port_relea + of_node_put(port->ofdev.node); + } + +-static int ehea_driver_sysfs_add(struct device *dev, +- struct device_driver *driver) +-{ +- int ret; +- +- ret = sysfs_create_link(&driver->kobj, &dev->kobj, +- kobject_name(&dev->kobj)); +- if (ret == 0) { +- ret = sysfs_create_link(&dev->kobj, &driver->kobj, +- "driver"); +- if (ret) +- sysfs_remove_link(&driver->kobj, +- kobject_name(&dev->kobj)); +- } +- return ret; +-} +- +-static void ehea_driver_sysfs_remove(struct device *dev, +- struct device_driver *driver) +-{ +- struct device_driver *drv = driver; +- +- if (drv) { +- sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj)); +- sysfs_remove_link(&dev->kobj, "driver"); +- } +-} +- + static struct device *ehea_register_port(struct ehea_port *port, + struct device_node *dn) + { +@@ -2856,16 +2828,8 @@ static struct device *ehea_register_port + goto out_unreg_of_dev; + } + +- ret = ehea_driver_sysfs_add(&port->ofdev.dev, &ehea_driver.driver); +- if (ret) { +- ehea_error("failed to register sysfs driver link"); +- goto out_rem_dev_file; +- } +- + return &port->ofdev.dev; + +-out_rem_dev_file: +- device_remove_file(&port->ofdev.dev, &dev_attr_log_port_id); + out_unreg_of_dev: + of_device_unregister(&port->ofdev); + out: +@@ -2874,7 +2838,6 @@ out: + + static void ehea_unregister_port(struct ehea_port *port) + { +- ehea_driver_sysfs_remove(&port->ofdev.dev, &ehea_driver.driver); + device_remove_file(&port->ofdev.dev, &dev_attr_log_port_id); + of_device_unregister(&port->ofdev); + } |