Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 (a3634d71) · Commits · 戴 / test

Documentation/SubmittingPatches

+2 −2

Original line number	Diff line number	Diff line
		@@ -464,8 +464,8 @@ section Linus Computer Science 101.
		Nuff said. If your code deviates too much from this, it is likely
		to be rejected without further review, and without comment.

		Once significant exception is when moving code from one file to
		another in this case you should not modify the moved code at all in
		One significant exception is when moving code from one file to
		another -- in this case you should not modify the moved code at all in
		the same patch which moves it. This clearly delineates the act of
		moving the code and your changes. This greatly aids review of the
		actual differences and allows tools to better track the history of

0 → 100644

+556 −0

File added.

Preview size limit exceeded, changes collapsed.

+0 −18

Original line number	Diff line number	Diff line
		@@ -257,22 +257,6 @@ void class_device_remove_file(struct class_device * class_dev,
		sysfs_remove_file(&class_dev->kobj, &attr->attr);
		}

		int class_device_create_bin_file(struct class_device *class_dev,
		struct bin_attribute *attr)
		{
		int error = -EINVAL;
		if (class_dev)
		error = sysfs_create_bin_file(&class_dev->kobj, attr);
		return error;
		}

		void class_device_remove_bin_file(struct class_device *class_dev,
		struct bin_attribute *attr)
		{
		if (class_dev)
		sysfs_remove_bin_file(&class_dev->kobj, attr);
		}

		static ssize_t
		class_device_attr_show(struct kobject * kobj, struct attribute * attr,
		char * buf)
		@@ -885,8 +869,6 @@ EXPORT_SYMBOL_GPL(class_device_create);
		EXPORT_SYMBOL_GPL(class_device_destroy);
		EXPORT_SYMBOL_GPL(class_device_create_file);
		EXPORT_SYMBOL_GPL(class_device_remove_file);
		EXPORT_SYMBOL_GPL(class_device_create_bin_file);
		EXPORT_SYMBOL_GPL(class_device_remove_bin_file);

		EXPORT_SYMBOL_GPL(class_interface_register);
		EXPORT_SYMBOL_GPL(class_interface_unregister);

+3 −3

Original line number	Diff line number	Diff line
		@@ -1228,18 +1228,18 @@ int device_rename(struct device dev, char new_name)
		sysfs_remove_link(&dev->parent->kobj, old_class_name);
		}
		}
		#endif

		#else
		if (dev->class) {
		sysfs_remove_link(&dev->class->subsys.kobj, old_device_name);
		error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
		dev->bus_id);
		if (error) {
		/* Uh... how to unravel this if restoring can fail? */
		dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n",
		__FUNCTION__, error);
		}
		}
		#endif

		out:
		put_device(dev);

+2 −2

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ struct dentry sysfs_get_dentry(struct sysfs_dirent sd)
		* RETURNS:
		* Pointer to @sd on success, NULL on failure.
		*/
		struct sysfs_dirent sysfs_get_active(struct sysfs_dirent sd)
		static struct sysfs_dirent sysfs_get_active(struct sysfs_dirent sd)
		{
		if (unlikely(!sd))
		return NULL;
		@@ -161,7 +161,7 @@ struct sysfs_dirent sysfs_get_active(struct sysfs_dirent sd)
		* Put an active reference to @sd. This function is noop if @sd
		* is NULL.
		*/
		void sysfs_put_active(struct sysfs_dirent *sd)
		static void sysfs_put_active(struct sysfs_dirent *sd)
		{
		struct completion *cmpl;
		int v;