Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (38 commits)
  ps3flash: Always read chunks of 256 KiB, and cache them
  ps3flash: Cache the last accessed FLASH chunk
  ps3: Replace direct file operations by callback
  ps3: Switch ps3_os_area_[gs]et_rtc_diff to EXPORT_SYMBOL_GPL()
  ps3: Correct debug message in dma_ioc0_map_pages()
  drivers/ps3: Add missing annotations
  ps3fb: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
  ps3flash: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
  ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata
  ps3: Use dev_[gs]et_drvdata() instead of direct access for system bus devices
  block/ps3: remove driver_data direct access of struct device
  ps3vram: Make ps3vram_priv.reports a void *
  ps3vram: Remove no longer used ps3vram_priv.ddr_base
  ps3vram: Replace mutex by spinlock + bio_list
  block: Add bio_list_peek()
  powerpc: Use generic atomic64_t implementation on 32-bit processors
  lib: Provide generic atomic64_t implementation
  powerpc: Add compiler memory barrier to mtmsr macro
  powerpc/iseries: Mark signal_vsp_instruction() as maybe unused
  powerpc/iseries: Fix unused function warning in iSeries DT code
  ...

2 files changed, 6 insertions, 8 deletions

diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 1ba9f9a8c308..bb870b8f81bc 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -162,7 +162,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev)
         dev_dbg(&dev->core, "%s:%d: virq            %lu\n", __func__, __LINE__,
                 (unsigned long)virq);
 
-        ps3_system_bus_set_driver_data(dev, hcd);
+        ps3_system_bus_set_drvdata(dev, hcd);
 
         result = usb_add_hcd(hcd, virq, IRQF_DISABLED);
 
@@ -195,8 +195,7 @@ fail_start:
 static int ps3_ehci_remove(struct ps3_system_bus_device *dev)
 {
         unsigned int tmp;
-        struct usb_hcd *hcd =
-                (struct usb_hcd *)ps3_system_bus_get_driver_data(dev);
+        struct usb_hcd *hcd = ps3_system_bus_get_drvdata(dev);
 
         BUG_ON(!hcd);
 
@@ -208,7 +207,7 @@ static int ps3_ehci_remove(struct ps3_system_bus_device *dev)
         ehci_shutdown(hcd);
         usb_remove_hcd(hcd);
 
-        ps3_system_bus_set_driver_data(dev, NULL);
+        ps3_system_bus_set_drvdata(dev, NULL);
 
         BUG_ON(!hcd->regs);
         iounmap(hcd->regs);
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 3d1910317328..1d56259c5db1 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -162,7 +162,7 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev)
         dev_dbg(&dev->core, "%s:%d: virq            %lu\n", __func__, __LINE__,
                 (unsigned long)virq);
 
-        ps3_system_bus_set_driver_data(dev, hcd);
+        ps3_system_bus_set_drvdata(dev, hcd);
 
         result = usb_add_hcd(hcd, virq, IRQF_DISABLED);
 
@@ -195,8 +195,7 @@ fail_start:
 static int ps3_ohci_remove(struct ps3_system_bus_device *dev)
 {
         unsigned int tmp;
-        struct usb_hcd *hcd =
-                (struct usb_hcd *)ps3_system_bus_get_driver_data(dev);
+        struct usb_hcd *hcd = ps3_system_bus_get_drvdata(dev);
 
         BUG_ON(!hcd);
 
@@ -208,7 +207,7 @@ static int ps3_ohci_remove(struct ps3_system_bus_device *dev)
         ohci_shutdown(hcd);
         usb_remove_hcd(hcd);
 
-        ps3_system_bus_set_driver_data(dev, NULL);
+        ps3_system_bus_set_drvdata(dev, NULL);
 
         BUG_ON(!hcd->regs);
         iounmap(hcd->regs);