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

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

Pull driver core updates from Greg KH:
 "Here are a small set of changes for 6.5-rc1 for some driver core
  changes. Included in here are:

   - device property cleanups to make it easier to write "agnostic"
     drivers when regards to the firmware layer underneath them (DT vs.
     ACPI)

   - debugfs documentation updates

   - devres additions

   - sysfs documentation and changes to handle empty directory creation
     logic better

   - tiny kernfs optimizations

   - other tiny changes

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

* tag 'driver-core-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  sysfs: Skip empty folders creation
  sysfs: Improve readability by following the kernel coding style
  drivers: fwnode: fix fwnode_irq_get[_byname]()
  ata: ahci_platform: Make code agnostic to OF/ACPI
  device property: Implement device_is_compatible()
  ACPI: Move ACPI_DEVICE_CLASS() to mod_devicetable.h
  base/node: Use 'property' to identify an access parameter
  driver core: device.h: add some missing kerneldocs
  kernfs: fix missing kernfs_idr_lock to remove an ID from the IDR
  isa: Remove unnecessary checks
  MAINTAINERS: add entry for auxiliary bus
  debugfs: Correct the 'debugfs_create_str' docs
  serial: qcom_geni: Comment use of devm_krealloc rather than devm_krealloc_array
  iio: adc: Use devm_krealloc_array
  hwmon: pmbus: Use devm_krealloc_array
parents 44aeec83 a91845b9

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -3385,6 +3385,16 @@ F: include/uapi/linux/audit.h 
F:	kernel/audit*

F:	lib/*audit.c









AUXILIARY BUS DRIVER









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>









R:	Dave Ertman <david.m.ertman@intel.com>









R:	Ira Weiny <ira.weiny@intel.com>









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git









F:	Documentation/driver-api/auxiliary_bus.rst









F:	drivers/base/auxiliary.c









F:	include/linux/auxiliary_bus.h

















AUXILIARY DISPLAY DRIVERS









M:	Miguel Ojeda <ojeda@kernel.org>









S:	Maintained
































drivers/ata/ahci_platform.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -9,14 +9,14 @@







 */



















#include <linux/kernel.h>









#include <linux/mod_devicetable.h>









#include <linux/module.h>









#include <linux/pm.h>









#include <linux/device.h>









#include <linux/of_device.h>









#include <linux/platform_device.h>









#include <linux/property.h>









#include <linux/libata.h>









#include <linux/ahci_platform.h>









#include <linux/acpi.h>









#include <linux/pci_ids.h>









#include "ahci.h"


















@@ -56,10 +56,10 @@ static int ahci_probe(struct platform_device *pdev)







	if (rc)









		return rc;



















	if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))









	if (device_is_compatible(dev, "hisilicon,hisi-ahci"))









		hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;



















	port = acpi_device_get_match_data(dev);









	port = device_get_match_data(dev);









	if (!port)









		port = &ahci_port_info;










































drivers/base/isa.c



+2
−5






























Original line number
Diff line number
Diff line







@@ -149,11 +149,8 @@ int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)







			break;









		}



















		if (isa_dev->dev.platform_data) {









		isa_dev->next = isa_driver->devices;









		isa_driver->devices = &isa_dev->dev;









		} else









			device_unregister(&isa_dev->dev);









	}



















	if (!error && !isa_driver->devices)
































drivers/base/node.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -162,15 +162,15 @@ static struct node_access_nodes *node_init_node_access(struct node *node,







}



















#ifdef CONFIG_HMEM_REPORTING









#define ACCESS_ATTR(name)						\









static ssize_t name##_show(struct device *dev,				\









#define ACCESS_ATTR(property)						\









static ssize_t property##_show(struct device *dev,			\









			   struct device_attribute *attr,		\









			   char *buf)					\









{									\









	return sysfs_emit(buf, "%u\n",					\









			  to_access_nodes(dev)->hmem_attrs.name);	\









			  to_access_nodes(dev)->hmem_attrs.property);	\









}									\









static DEVICE_ATTR_RO(name)









static DEVICE_ATTR_RO(property)



















ACCESS_ATTR(read_bandwidth);









ACCESS_ATTR(read_latency);
































drivers/base/property.c



+9
−3






























Original line number
Diff line number
Diff line







@@ -987,12 +987,18 @@ EXPORT_SYMBOL(fwnode_iomap);







 * @fwnode:	Pointer to the firmware node









 * @index:	Zero-based index of the IRQ









 *









 * Return: Linux IRQ number on success. Other values are determined









 * according to acpi_irq_get() or of_irq_get() operation.









 * Return: Linux IRQ number on success. Negative errno on failure.









 */









int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index)









{









	return fwnode_call_int_op(fwnode, irq_get, index);









	int ret;



















	ret = fwnode_call_int_op(fwnode, irq_get, index);









	/* We treat mapping errors as invalid case */









	if (ret == 0)









		return -EINVAL;



















	return ret;









}









EXPORT_SYMBOL(fwnode_irq_get);