Commit 72d657dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 

Pull driver core fixes from Greg KH:
 "Here is one small sysfs change, and a documentation update for 5.0-rc2

  The sysfs change moves from using BUG_ON to WARN_ON, as discussed in
  an email thread on lkml while trying to track down another driver bug.
  sysfs should not be crashing and preventing people from seeing where
  they went wrong. Now it properly recovers and warns the developer.

  The documentation update removes the use of BUS_ATTR() as the kernel
  is moving away from this to use the specific BUS_ATTR_RW() and friends
  instead. There are pending patches in all of the different subsystems
  to remove the last users of this macro, but for now, don't advertise
  it should be used anymore to keep new ones from being introduced.

  Both have been in linux-next with no reported issues"

* tag 'driver-core-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  Documentation: driver core: remove use of BUS_ATTR
  sysfs: convert BUG_ON to WARN_ON
parents f7c1038b 735df0ff

Documentation/driver-model/bus.txt

+4 −4
Original line number Diff line number Diff line
@@ -124,11 +124,11 @@ struct bus_attribute { 
	ssize_t (*store)(struct bus_type *, const char * buf, size_t count);

};



Bus drivers can export attributes using the BUS_ATTR macro that works

similarly to the DEVICE_ATTR macro for devices. For example, a definition 

like this:

Bus drivers can export attributes using the BUS_ATTR_RW macro that works

similarly to the DEVICE_ATTR_RW macro for devices. For example, a

definition like this:



static BUS_ATTR(debug,0644,show_debug,store_debug);

static BUS_ATTR_RW(debug);



is equivalent to declaring:

Documentation/filesystems/sysfs.txt

+3 −1
Original line number Diff line number Diff line
@@ -344,7 +344,9 @@ struct bus_attribute { 


Declaring:



BUS_ATTR(_name, _mode, _show, _store)

static BUS_ATTR_RW(name);

static BUS_ATTR_RO(name);

static BUS_ATTR_WO(name);



Creation/Removal:

fs/sysfs/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns) 
	kuid_t uid;

	kgid_t gid;



	BUG_ON(!kobj);

	if (WARN_ON(!kobj))

		return -EINVAL;



	if (kobj->parent)

		parent = kobj->parent->sd;

fs/sysfs/file.c

+4 −2
Original line number Diff line number Diff line
@@ -325,7 +325,8 @@ int sysfs_create_file_ns(struct kobject *kobj, const struct attribute *attr, 
	kuid_t uid;

	kgid_t gid;



	BUG_ON(!kobj || !kobj->sd || !attr);

	if (WARN_ON(!kobj || !kobj->sd || !attr))

		return -EINVAL;



	kobject_get_ownership(kobj, &uid, &gid);

	return sysfs_add_file_mode_ns(kobj->sd, attr, false, attr->mode,
@@ -537,7 +538,8 @@ int sysfs_create_bin_file(struct kobject *kobj, 
	kuid_t uid;

	kgid_t gid;



	BUG_ON(!kobj || !kobj->sd || !attr);

	if (WARN_ON(!kobj || !kobj->sd || !attr))

		return -EINVAL;



	kobject_get_ownership(kobj, &uid, &gid);

	return sysfs_add_file_mode_ns(kobj->sd, &attr->attr, true,

fs/sysfs/group.c

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ static int internal_create_group(struct kobject *kobj, int update, 
	kgid_t gid;

	int error;



	BUG_ON(!kobj || (!update && !kobj->sd));

	if (WARN_ON(!kobj || (!update && !kobj->sd)))

		return -EINVAL;



	/* Updates may happen before the object has been instantiated */

	if (unlikely(update && !kobj->sd))

CRA Git | Maintained and supported by SUSTech CRA and CCSE