usb/ps3: Add missing annotations

[net-next-2.6.git] / drivers / usb / host / ehci-ps3.c

diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 9c9da35abc6c010c6929a1e515fc4179ef898111..3e8844e56ca9a1dd49e5f2676c81d8265415d2ba 100644 (file)
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -76,12 +76,12 @@ static const struct hc_driver ps3_ehci_hc_driver = {
        .port_handed_over       = ehci_port_handed_over,
 };
 
-static int ps3_ehci_probe(struct ps3_system_bus_device *dev)
+static int __devinit ps3_ehci_probe(struct ps3_system_bus_device *dev)
 {
        int result;
        struct usb_hcd *hcd;
        unsigned int virq;
-       static u64 dummy_mask = DMA_32BIT_MASK;
+       static u64 dummy_mask = DMA_BIT_MASK(32);
 
        if (usb_disabled()) {
                result = -ENODEV;
@@ -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);
@@ -225,7 +224,7 @@ static int ps3_ehci_remove(struct ps3_system_bus_device *dev)
        return 0;
 }
 
-static int ps3_ehci_driver_register(struct ps3_system_bus_driver *drv)
+static int __init ps3_ehci_driver_register(struct ps3_system_bus_driver *drv)
 {
        return firmware_has_feature(FW_FEATURE_PS3_LV1)
                ? ps3_system_bus_driver_register(drv)