Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (47 commits)
  Driver core: Don't call put methods while holding a spinlock
  Driver core: Remove unneeded routines from driver core
  Driver core: Fix potential deadlock in driver core
  PCI: enable driver multi-threaded probe
  Driver Core: add ability for drivers to do a threaded probe
  sysfs: add proper sysfs_init() prototype
  drivers/base: check errors
  drivers/base: Platform notify needs to occur before drivers attach to the device
  v4l-dev2: handle __must_check
  add CONFIG_ENABLE_MUST_CHECK
  add __must_check to device management code
  Driver core: fixed add_bind_files() definition
  Driver core: fix comments in drivers/base/power/resume.c
  sysfs_remove_bin_file: no return value, dump_stack on error
  kobject: must_check fixes
  Driver core: add ability for devices to create and remove bin files
  Class: add support for class interfaces for devices
  Driver core: create devices/virtual/ tree
  Driver core: add device_rename function
  Driver core: add ability for classes to handle devices properly
  ...
parents e8216dee 7e9f4b2d

Documentation/ABI/obsolete/devfs→Documentation/ABI/removed/devfs

+2 −3
Original line number Diff line number Diff line 
What:		devfs

Date:		July 2005

Date:		July 2005 (scheduled), finally removed in kernel v2.6.18

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Description:

	devfs has been unmaintained for a number of years, has unfixable

	races, contains a naming policy within the kernel that is

	against the LSB, and can be replaced by using udev.

	The files fs/devfs/*, include/linux/devfs_fs*.h will be removed,

	The files fs/devfs/*, include/linux/devfs_fs*.h were removed,

	along with the the assorted devfs function calls throughout the

	kernel tree.



Users:

Documentation/ABI/testing/sysfs-power

0 → 100644
+88 −0
Original line number Diff line number Diff line 
What:		/sys/power/

Date:		August 2006

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/power directory will contain files that will

		provide a unified interface to the power management

		subsystem.



What:		/sys/power/state

Date:		August 2006

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/power/state file controls the system power state.

		Reading from this file returns what states are supported,

		which is hard-coded to 'standby' (Power-On Suspend), 'mem'

		(Suspend-to-RAM), and 'disk' (Suspend-to-Disk).



		Writing to this file one of these strings causes the system to

		transition into that state. Please see the file

		Documentation/power/states.txt for a description of each of

		these states.



What:		/sys/power/disk

Date:		August 2006

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/power/disk file controls the operating mode of the

		suspend-to-disk mechanism.  Reading from this file returns

		the name of the method by which the system will be put to

		sleep on the next suspend.  There are four methods supported:

		'firmware' - means that the memory image will be saved to disk

		by some firmware, in which case we also assume that the

		firmware will handle the system suspend.

		'platform' - the memory image will be saved by the kernel and

		the system will be put to sleep by the platform driver (e.g.

		ACPI or other PM registers).

		'shutdown' - the memory image will be saved by the kernel and

		the system will be powered off.

		'reboot' - the memory image will be saved by the kernel and

		the system will be rebooted.



		The suspend-to-disk method may be chosen by writing to this

		file one of the accepted strings:



		'firmware'

		'platform'

		'shutdown'

		'reboot'



		It will only change to 'firmware' or 'platform' if the system

		supports that.



What:		/sys/power/image_size

Date:		August 2006

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/power/image_size file controls the size of the image

		created by the suspend-to-disk mechanism.  It can be written a

		string representing a non-negative integer that will be used

		as an upper limit of the image size, in bytes.  The kernel's

		suspend-to-disk code will do its best to ensure the image size

		will not exceed this number.  However, if it turns out to be

		impossible, the kernel will try to suspend anyway using the

		smallest image possible.  In particular, if "0" is written to

		this file, the suspend image will be as small as possible.



		Reading from this file will display the current image size

		limit, which is set to 500 MB by default.



What:		/sys/power/pm_trace

Date:		August 2006

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/power/pm_trace file controls the code which saves the

		last PM event point in the RTC across reboots, so that you can

		debug a machine that just hangs during suspend (or more

		commonly, during resume).  Namely, the RTC is only used to save

		the last PM event point if this file contains '1'.  Initially

		it contains '0' which may be changed to '1' by writing a

		string representing a nonzero integer into it.



		To use this debugging feature you should attempt to suspend

		the machine, then reboot it and run



		dmesg -s 1000000 | grep 'hash matches'



		CAUTION: Using it will cause your machine's real-time (CMOS)

		clock to be set to a random invalid time after a resume.

Documentation/feature-removal-schedule.txt

+27 −0
Original line number Diff line number Diff line
@@ -6,6 +6,21 @@ be removed from this file. 


---------------------------



What:	/sys/devices/.../power/state

	dev->power.power_state

	dpm_runtime_{suspend,resume)()

When:	July 2007

Why:	Broken design for runtime control over driver power states, confusing

	driver-internal runtime power management with:  mechanisms to support

	system-wide sleep state transitions; event codes that distinguish

	different phases of swsusp "sleep" transitions; and userspace policy

	inputs.  This framework was never widely used, and most attempts to

	use it were broken.  Drivers should instead be exposing domain-specific

	interfaces either to kernel or to userspace.

Who:	Pavel Machek <pavel@suse.cz>



---------------------------



What:	RAW driver (CONFIG_RAW_DRIVER)

When:	December 2005

Why:	declared obsolete since kernel 2.6.3
@@ -294,3 +309,15 @@ Why: The frame diverter is included in most distribution kernels, but is 
	It is not clear if anyone is still using it.

Who:	Stephen Hemminger <shemminger@osdl.org>



---------------------------





What:	PHYSDEVPATH, PHYSDEVBUS, PHYSDEVDRIVER in the uevent environment

When:	Oktober 2008

Why:	The stacking of class devices makes these values misleading and

	inconsistent.

	Class devices should not carry any of these properties, and bus

	devices have SUBSYTEM and DRIVER as a replacement.

Who:	Kay Sievers <kay.sievers@suse.de>



---------------------------

Documentation/power/devices.txt

+535 −190

File changed.

Preview size limit exceeded, changes collapsed.

drivers/base/base.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extern int cpu_dev_init(void); 
extern int attribute_container_init(void);



extern int bus_add_device(struct device * dev);

extern void bus_attach_device(struct device * dev);

extern int bus_attach_device(struct device * dev);

extern void bus_remove_device(struct device * dev);

extern struct bus_type *get_bus(struct bus_type * bus);

extern void put_bus(struct bus_type * bus);