Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 (84860bf0) · Commits · e / devices / android_kernel_teracube_2e

Documentation/Changes

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ o isdn4k-utils 3.1pre1 # isdnctrl 2>&1\|grep version
		o nfs-utils 1.0.5 # showmount --version
		o procps 3.2.0 # ps --version
		o oprofile 0.9 # oprofiled --version
		o udev 058 # udevinfo -V
		o udev 071 # udevinfo -V

		Kernel compilation
		==================

Documentation/DocBook/writing_usb_driver.tmpl

+1 −2

Original line number	Diff line number	Diff line
		@@ -345,7 +345,6 @@ if (!retval) {
		<programlisting>
		static inline void skel_delete (struct usb_skel *dev)
		{
		if (dev->bulk_in_buffer != NULL)
		kfree (dev->bulk_in_buffer);
		if (dev->bulk_out_buffer != NULL)
		usb_buffer_free (dev->udev, dev->bulk_out_size,

Documentation/driver-model/driver.txt

+6 −62

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@ struct device_driver {
		int (probe) (struct device dev);
		int (remove) (struct device dev);

		int (suspend) (struct device dev, pm_message_t state, u32 level);
		int (resume) (struct device dev, u32 level);
		int (suspend) (struct device dev, pm_message_t state);
		int (resume) (struct device dev);
		};


		@@ -194,69 +194,13 @@ device; i.e. anything in the device's driver_data field.
		If the device is still present, it should quiesce the device and place
		it into a supported low-power state.

		int (suspend) (struct device dev, pm_message_t state, u32 level);
		int (suspend) (struct device dev, pm_message_t state);

		suspend is called to put the device in a low power state. There are
		several stages to successfully suspending a device, which is denoted in
		the @level parameter. Breaking the suspend transition into several
		stages affords the platform flexibility in performing device power
		management based on the requirements of the system and the
		user-defined policy.
		suspend is called to put the device in a low power state.

		SUSPEND_NOTIFY notifies the device that a suspend transition is about
		to happen. This happens on system power state transitions to verify
		that all devices can successfully suspend.
		int (resume) (struct device dev);

		A driver may choose to fail on this call, which should cause the
		entire suspend transition to fail. A driver should fail only if it
		knows that the device will not be able to be resumed properly when the
		system wakes up again. It could also fail if it somehow determines it
		is in the middle of an operation too important to stop.

		SUSPEND_DISABLE tells the device to stop I/O transactions. When it
		stops transactions, or what it should do with unfinished transactions
		is a policy of the driver. After this call, the driver should not
		accept any other I/O requests.

		SUSPEND_SAVE_STATE tells the device to save the context of the
		hardware. This includes any bus-specific hardware state and
		device-specific hardware state. A pointer to this saved state can be
		stored in the device's saved_state field.

		SUSPEND_POWER_DOWN tells the driver to place the device in the low
		power state requested.

		Whether suspend is called with a given level is a policy of the
		platform. Some levels may be omitted; drivers must not assume the
		reception of any level. However, all levels must be called in the
		order above; i.e. notification will always come before disabling;
		disabling the device will come before suspending the device.

		All calls are made with interrupts enabled, except for the
		SUSPEND_POWER_DOWN level.

		int (resume) (struct device dev, u32 level);

		Resume is used to bring a device back from a low power state. Like the
		suspend transition, it happens in several stages.

		RESUME_POWER_ON tells the driver to set the power state to the state
		before the suspend call (The device could have already been in a low
		power state before the suspend call to put in a lower power state).

		RESUME_RESTORE_STATE tells the driver to restore the state saved by
		the SUSPEND_SAVE_STATE suspend call.

		RESUME_ENABLE tells the driver to start accepting I/O transactions
		again. Depending on driver policy, the device may already have pending
		I/O requests.

		RESUME_POWER_ON is called with interrupts disabled. The other resume
		levels are called with interrupts enabled.

		As with the various suspend stages, the driver must not assume that
		any other resume calls have been or will be made. Each call should be
		self-contained and not dependent on any external state.
		Resume is used to bring a device back from a low power state.


		Attributes

Documentation/driver-model/porting.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@ When a driver is registered, the bus's list of devices is iterated
		over. bus->match() is called for each device that is not already
		claimed by a driver.

		When a device is successfully bound to a device, device->driver is
		When a device is successfully bound to a driver, device->driver is
		set, the device is added to a per-driver list of devices, and a
		symlink is created in the driver's sysfs directory that points to the
		device's physical directory:

arch/arm/common/locomo.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -550,15 +550,12 @@ struct locomo_save_data {
		u16 LCM_SPIMD;
		};

		static int locomo_suspend(struct device *dev, pm_message_t state, u32 level)
		static int locomo_suspend(struct device *dev, pm_message_t state)
		{
		struct locomo *lchip = dev_get_drvdata(dev);
		struct locomo_save_data *save;
		unsigned long flags;

		if (level != SUSPEND_DISABLE)
		return 0;

		save = kmalloc(sizeof(struct locomo_save_data), GFP_KERNEL);
		if (!save)
		return -ENOMEM;
		@@ -597,16 +594,13 @@ static int locomo_suspend(struct device *dev, pm_message_t state, u32 level)
		return 0;
		}

		static int locomo_resume(struct device *dev, u32 level)
		static int locomo_resume(struct device *dev)
		{
		struct locomo *lchip = dev_get_drvdata(dev);
		struct locomo_save_data *save;
		unsigned long r;
		unsigned long flags;

		if (level != RESUME_ENABLE)
		return 0;

		save = (struct locomo_save_data *) dev->power.saved_state;
		if (!save)
		return 0;