Commit d90be6e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-6.10-rc1' of... 

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

Pull driver core updates from Greg KH:
 "Here is the small set of driver core and kernfs changes for 6.10-rc1.

  Nothing major here at all, just a small set of changes for some driver
  core apis, and minor fixups. Included in here are:

   - sysfs_bin_attr_simple_read() helper added and used

   - device_show_string() helper added and used

  All usages of these were acked by the various maintainers. Also in
  here are:

   - kernfs minor cleanup

   - removed unused functions

   - typo fix in documentation

   - pay attention to sysfs_create_link() failures in module.c finally

  All of these have been in linux-next for a very long time with no
  reported problems"

* tag 'driver-core-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  device property: Fix a typo in the description of device_get_child_node_count()
  kernfs: mount: Remove unnecessary ‘NULL’ values from knparent
  scsi: Use device_show_string() helper for sysfs attributes
  platform/x86: Use device_show_string() helper for sysfs attributes
  perf: Use device_show_string() helper for sysfs attributes
  IB/qib: Use device_show_string() helper for sysfs attributes
  hwmon: Use device_show_string() helper for sysfs attributes
  driver core: Add device_show_string() helper for sysfs attributes
  treewide: Use sysfs_bin_attr_simple_read() helper
  sysfs: Add sysfs_bin_attr_simple_read() helper
  module: don't ignore sysfs_create_link() failures
  driver core: Remove unused platform_notify, platform_notify_remove
parents be81389c 880a746f

arch/powerpc/perf/hv-24x7.c

+0 −10
Original line number Diff line number Diff line
@@ -425,16 +425,6 @@ static char *memdup_to_str(char *maybe_str, int max_len, gfp_t gfp) 
	return kasprintf(gfp, "%.*s", max_len, maybe_str);

}



static ssize_t device_show_string(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct dev_ext_attribute *d;



	d = container_of(attr, struct dev_ext_attribute, attr);



	return sprintf(buf, "%s\n", (char *)d->var);

}



static ssize_t cpumask_show(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

arch/powerpc/platforms/powernv/opal.c

+1 −9
Original line number Diff line number Diff line
@@ -792,14 +792,6 @@ static int __init opal_sysfs_init(void) 
	return 0;

}



static ssize_t export_attr_read(struct file *fp, struct kobject *kobj,

				struct bin_attribute *bin_attr, char *buf,

				loff_t off, size_t count)

{

	return memory_read_from_buffer(buf, count, &off, bin_attr->private,

				       bin_attr->size);

}



static int opal_add_one_export(struct kobject *parent, const char *export_name,

			       struct device_node *np, const char *prop_name)

{
@@ -826,7 +818,7 @@ static int opal_add_one_export(struct kobject *parent, const char *export_name, 
	sysfs_bin_attr_init(attr);

	attr->attr.name = name;

	attr->attr.mode = 0400;

	attr->read = export_attr_read;

	attr->read = sysfs_bin_attr_simple_read;

	attr->private = __va(vals[0]);

	attr->size = vals[1];

arch/x86/events/intel/core.c

+3 −10
Original line number Diff line number Diff line
@@ -5645,17 +5645,10 @@ lbr_is_visible(struct kobject *kobj, struct attribute *attr, int i) 


static char pmu_name_str[30];



static ssize_t pmu_name_show(struct device *cdev,

			     struct device_attribute *attr,

			     char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%s\n", pmu_name_str);

}



static DEVICE_ATTR_RO(pmu_name);

static DEVICE_STRING_ATTR_RO(pmu_name, 0444, pmu_name_str);



static struct attribute *intel_pmu_caps_attrs[] = {

       &dev_attr_pmu_name.attr,

	&dev_attr_pmu_name.attr.attr,

	NULL

};

drivers/acpi/bgrt.c

+1 −8
Original line number Diff line number Diff line
@@ -29,14 +29,7 @@ BGRT_SHOW(type, image_type); 
BGRT_SHOW(xoffset, image_offset_x);

BGRT_SHOW(yoffset, image_offset_y);



static ssize_t image_read(struct file *file, struct kobject *kobj,

	       struct bin_attribute *attr, char *buf, loff_t off, size_t count)

{

	memcpy(buf, attr->private + off, count);

	return count;

}



static BIN_ATTR_RO(image, 0);	/* size gets filled in later */

static BIN_ATTR_SIMPLE_RO(image);



static struct attribute *bgrt_attributes[] = {

	&bgrt_attr_version.attr,

drivers/base/base.h

+6 −3
Original line number Diff line number Diff line
@@ -192,11 +192,14 @@ extern struct kset *devices_kset; 
void devices_kset_move_last(struct device *dev);



#if defined(CONFIG_MODULES) && defined(CONFIG_SYSFS)

void module_add_driver(struct module *mod, struct device_driver *drv);

int module_add_driver(struct module *mod, struct device_driver *drv);

void module_remove_driver(struct device_driver *drv);

#else

static inline void module_add_driver(struct module *mod,

				     struct device_driver *drv) { }

static inline int module_add_driver(struct module *mod,

				    struct device_driver *drv)

{

	return 0;

}

static inline void module_remove_driver(struct device_driver *drv) { }

#endif