linux-next: manual merge of the usb tree with the usb.current tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-tegra.c between commit ebf20de45304 ("EHCI: update
PM methods in ehci-tegra.c") from the usb.current tree and commit
fe375774bd88 ("usb: host: tegra: code clean up") from the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/host/ehci-tegra.c
index f214a80,4c1eb61..0000000
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -319,7 -423,37 +308,7 @@@ static int tegra_ehci_setup(struct usb_
  	return retval;
  }
  
- struct temp_buffer {
 -#ifdef CONFIG_PM
 -static int tegra_ehci_bus_suspend(struct usb_hcd *hcd)
 -{
 -	struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
 -	int error_status = 0;
 -
 -	error_status = ehci_bus_suspend(hcd);
 -	if (!error_status && tegra->power_down_on_bus_suspend) {
 -		tegra_usb_suspend(hcd);
 -		tegra->bus_suspended = 1;
 -	}
 -
 -	return error_status;
 -}
 -
 -static int tegra_ehci_bus_resume(struct usb_hcd *hcd)
 -{
 -	struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
 -
 -	if (tegra->bus_suspended && tegra->power_down_on_bus_suspend) {
 -		tegra_usb_resume(hcd);
 -		tegra->bus_suspended = 0;
 -	}
 -
 -	tegra_usb_phy_preresume(tegra->phy);
 -	tegra->port_resuming = 1;
 -	return ehci_bus_resume(hcd);
 -}
 -#endif
 -
+ struct dma_aligned_buffer {
  	void *kmalloc_ptr;
  	void *old_xfer_buffer;
  	u8 data[0];
@@@ -426,14 -548,20 +403,20 @@@ static const struct hc_driver tegra_ehc
  	.endpoint_reset		= ehci_endpoint_reset,
  	.get_frame_number	= ehci_get_frame,
  	.hub_status_data	= ehci_hub_status_data,
- 	.hub_control		= tegra_ehci_hub_control,
  	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
+ 	.relinquish_port	= ehci_relinquish_port,
+ 	.port_handed_over	= ehci_port_handed_over,
+ 
+ 	/* modified ehci functions for tegra */
+ 	.reset			= tegra_ehci_setup,
+ 	.shutdown		= tegra_ehci_shutdown,
+ 	.map_urb_for_dma	= tegra_ehci_map_urb_for_dma,
+ 	.unmap_urb_for_dma	= tegra_ehci_unmap_urb_for_dma,
+ 	.hub_control		= tegra_ehci_hub_control,
  #ifdef CONFIG_PM
 -	.bus_suspend		= tegra_ehci_bus_suspend,
 -	.bus_resume		= tegra_ehci_bus_resume,
 +	.bus_suspend		= ehci_bus_suspend,
 +	.bus_resume		= ehci_bus_resume,
  #endif
- 	.relinquish_port	= ehci_relinquish_port,
- 	.port_handed_over	= ehci_port_handed_over,
  };
  
  static int setup_vbus_gpio(struct platform_device *pdev)

Attachment: pgp00000.pgp
Description: PGP signature