Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6.git/ (742b0c90) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/pci.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -279,6 +279,7 @@ pci_for_each_dev_reverse() Superseded by pci_find_device_reverse()
	pci_for_each_bus() Superseded by pci_find_next_bus()		pci_for_each_bus() Superseded by pci_find_next_bus()
	pci_find_device() Superseded by pci_get_device()		pci_find_device() Superseded by pci_get_device()
	pci_find_subsys() Superseded by pci_get_subsys()		pci_find_subsys() Superseded by pci_get_subsys()
			pci_find_slot() Superseded by pci_get_slot()
	pcibios_find_class() Superseded by pci_get_class()		pcibios_find_class() Superseded by pci_get_class()
	pci_find_class() Superseded by pci_get_class()		pci_find_class() Superseded by pci_get_class()
	pci_(read\|write)__nodev() Superseded by pci_bus_(read\|write)_()		pci_(read\|write)__nodev() Superseded by pci_bus_(read\|write)_()

Documentation/power/pci.txt

+2 −33

Original line number	Original line	Diff line number	Diff line
	@@ -165,40 +165,9 @@ Description:
	These functions are intended for use by individual drivers, and are defined in		These functions are intended for use by individual drivers, and are defined in
	struct pci_driver:		struct pci_driver:

	int (save_state) (struct pci_dev dev, u32 state);		int (suspend) (struct pci_dev dev, pm_message_t state);
	int (suspend) (struct pci_dev dev, u32 state);
	int (resume) (struct pci_dev dev);		int (resume) (struct pci_dev dev);
	int (enable_wake) (struct pci_dev dev, u32 state, int enable);		int (enable_wake) (struct pci_dev dev, pci_power_t state, int enable);


	save_state
	----------

	Usage:

	if (dev->driver && dev->driver->save_state)
	dev->driver->save_state(dev,state);

	The driver should use this callback to save device state. It should take into
	account the current state of the device and the requested state in order to
	avoid any unnecessary operations.

	For example, a video card that supports all 4 states (D0-D3), all controller
	context is preserved when entering D1, but the screen is placed into a low power
	state (blanked).

	The driver can also interpret this function as a notification that it may be
	entering a sleep state in the near future. If it knows that the device cannot
	enter the requested state, either because of lack of support for it, or because
	the device is middle of some critical operation, then it should fail.

	This function should not be used to set any state in the device or the driver
	because the device may not actually enter the sleep state (e.g. another driver
	later causes causes a global state transition to fail).

	Note that in intermediate low power states, a device's I/O and memory spaces may
	be disabled and may not be available in subsequent transitions to lower power
	states.


	suspend		suspend

arch/arm/mach-ixp4xx/common-pci.c

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -501,15 +501,6 @@ pci_set_dma_mask(struct pci_dev *dev, u64 mask)
	return -EIO;		return -EIO;
	}		}

	int
	pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask)
	{
	if (mask >= SZ_64M - 1 )
	return 0;

	return -EIO;
	}

	int		int
	pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)		pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
	{		{
	@@ -520,7 +511,6 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
	}		}

	EXPORT_SYMBOL(pci_set_dma_mask);		EXPORT_SYMBOL(pci_set_dma_mask);
	EXPORT_SYMBOL(pci_dac_set_dma_mask);
	EXPORT_SYMBOL(pci_set_consistent_dma_mask);		EXPORT_SYMBOL(pci_set_consistent_dma_mask);
	EXPORT_SYMBOL(ixp4xx_pci_read);		EXPORT_SYMBOL(ixp4xx_pci_read);
	EXPORT_SYMBOL(ixp4xx_pci_write);		EXPORT_SYMBOL(ixp4xx_pci_write);

drivers/pci/hotplug/ibmphp.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -196,7 +196,7 @@ struct ebda_hpc_bus {


	/********************************************************************		/********************************************************************
	* THREE TYPE OF HOT PLUG CONTROLER *		* THREE TYPE OF HOT PLUG CONTROLLER *
	********************************************************************/		********************************************************************/

	struct isa_ctlr_access {		struct isa_ctlr_access {

drivers/pci/hotplug/ibmphp_hpc.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,7 @@ static int to_debug = FALSE;
	#define WPG_I2C_OR 0x2000 // I2C OR operation		#define WPG_I2C_OR 0x2000 // I2C OR operation

	//----------------------------------------------------------------------------		//----------------------------------------------------------------------------
	// Command set for I2C Master Operation Setup Regisetr		// Command set for I2C Master Operation Setup Register
	//----------------------------------------------------------------------------		//----------------------------------------------------------------------------
	#define WPG_READATADDR_MASK 0x00010000 // read,bytes,I2C shifted,index		#define WPG_READATADDR_MASK 0x00010000 // read,bytes,I2C shifted,index
	#define WPG_WRITEATADDR_MASK 0x40010000 // write,bytes,I2C shifted,index		#define WPG_WRITEATADDR_MASK 0x40010000 // write,bytes,I2C shifted,index
	@@ -835,7 +835,7 @@ static void poll_hpc (void)
	if (ibmphp_shutdown)		if (ibmphp_shutdown)
	break;		break;

	/* try to get the lock to do some kind of harware access */		/* try to get the lock to do some kind of hardware access */
	down (&semOperations);		down (&semOperations);

	switch (poll_state) {		switch (poll_state) {
	@@ -906,7 +906,7 @@ static void poll_hpc (void)
	poll_state = POLL_LATCH_REGISTER;		poll_state = POLL_LATCH_REGISTER;
	break;		break;
	}		}
	/* give up the harware semaphore */		/* give up the hardware semaphore */
	up (&semOperations);		up (&semOperations);
	/* sleep for a short time just for good measure */		/* sleep for a short time just for good measure */
	msleep(100);		msleep(100);