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

Merge tag 'driver-core-4.14-rc4' of... 

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

Pull driver core fixes from Greg KH:
 "Here are a few small fixes for 4.14-rc4.

  The removal of DRIVER_ATTR() was almost completed by 4.14-rc1, but one
  straggler made it in through some other tree (odds are, one of
  mine...) So there's a simple removal of the last user, and then
  finally the macro is removed from the tree.

  There's a fix for old crazy udev instances that insist on reloading a
  module when it is removed from the kernel due to the new uevents for
  bind/unbind. This fixes the reported regression, hopefully some year
  in the future we can drop the workaround, once users update to the
  latest version, but I'm not holding my breath.

  And then there's a build fix for a linker warning, and a buffer
  overflow fix to match the PCI fixes you took through the PCI tree in
  the same area.

  All of these have been in linux-next for a few weeks while I've been
  traveling, sorry for the delay"

* tag 'driver-core-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  driver core: remove DRIVER_ATTR
  fpga: altera-cvp: remove DRIVER_ATTR() usage
  driver core: platform: Don't read past the end of "driver_override" buffer
  base: arch_topology: fix section mismatch build warnings
  driver core: suppress sending MODALIAS in UNBIND uevents
parents 3a98be09 850fdec8

Documentation/driver-model/driver.txt

+4 −3
Original line number Diff line number Diff line
@@ -196,12 +196,13 @@ struct driver_attribute { 
};



Device drivers can export attributes via their sysfs directories. 

Drivers can declare attributes using a DRIVER_ATTR macro that works

identically to the DEVICE_ATTR macro. 

Drivers can declare attributes using a DRIVER_ATTR_RW and DRIVER_ATTR_RO

macro that works identically to the DEVICE_ATTR_RW and DEVICE_ATTR_RO

macros.



Example:



DRIVER_ATTR(debug,0644,show_debug,store_debug);

DRIVER_ATTR_RW(debug);



This is equivalent to declaring:

Documentation/filesystems/sysfs.txt

+2 −1
Original line number Diff line number Diff line
@@ -366,7 +366,8 @@ struct driver_attribute { 


Declaring:



DRIVER_ATTR(_name, _mode, _show, _store)

DRIVER_ATTR_RO(_name)

DRIVER_ATTR_RW(_name)



Creation/Removal:

drivers/base/arch_topology.c

+6 −6
Original line number Diff line number Diff line
@@ -166,11 +166,11 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) 
}



#ifdef CONFIG_CPU_FREQ

static cpumask_var_t cpus_to_visit;

static void parsing_done_workfn(struct work_struct *work);

static DECLARE_WORK(parsing_done_work, parsing_done_workfn);

static cpumask_var_t cpus_to_visit __initdata;

static void __init parsing_done_workfn(struct work_struct *work);

static __initdata DECLARE_WORK(parsing_done_work, parsing_done_workfn);



static int

static int __init

init_cpu_capacity_callback(struct notifier_block *nb,

			   unsigned long val,

			   void *data)
@@ -206,7 +206,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, 
	return 0;

}



static struct notifier_block init_cpu_capacity_notifier = {

static struct notifier_block init_cpu_capacity_notifier __initdata = {

	.notifier_call = init_cpu_capacity_callback,

};
@@ -232,7 +232,7 @@ static int __init register_cpufreq_notifier(void) 
}

core_initcall(register_cpufreq_notifier);



static void parsing_done_workfn(struct work_struct *work)

static void __init parsing_done_workfn(struct work_struct *work)

{

	cpufreq_unregister_notifier(&init_cpu_capacity_notifier,

					 CPUFREQ_POLICY_NOTIFIER);

drivers/base/platform.c

+2 −1
Original line number Diff line number Diff line
@@ -868,7 +868,8 @@ static ssize_t driver_override_store(struct device *dev, 
	struct platform_device *pdev = to_platform_device(dev);

	char *driver_override, *old, *cp;



	if (count > PATH_MAX)

	/* We need to keep extra room for a newline */

	if (count >= (PAGE_SIZE - 1))

		return -EINVAL;



	driver_override = kstrndup(buf, count, GFP_KERNEL);

drivers/fpga/altera-cvp.c

+3 −3
Original line number Diff line number Diff line
@@ -361,12 +361,12 @@ static const struct fpga_manager_ops altera_cvp_ops = { 
	.write_complete	= altera_cvp_write_complete,

};



static ssize_t show_chkcfg(struct device_driver *dev, char *buf)

static ssize_t chkcfg_show(struct device_driver *dev, char *buf)

{

	return snprintf(buf, 3, "%d\n", altera_cvp_chkcfg);

}



static ssize_t store_chkcfg(struct device_driver *drv, const char *buf,

static ssize_t chkcfg_store(struct device_driver *drv, const char *buf,

			    size_t count)

{

	int ret;
@@ -378,7 +378,7 @@ static ssize_t store_chkcfg(struct device_driver *drv, const char *buf, 
	return count;

}



static DRIVER_ATTR(chkcfg, 0600, show_chkcfg, store_chkcfg);

static DRIVER_ATTR_RW(chkcfg);



static int altera_cvp_probe(struct pci_dev *pdev,

			    const struct pci_device_id *dev_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE