Merge linux-2.6 with linux-acpi-2.6

14 files changed, 29 insertions, 33 deletions

diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index bb1db1959854..c466739428b2 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -960,7 +960,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
                         intf->altsetting->desc.bInterfaceNumber);
 
         /* instance init */
-        instance = kcalloc(1, sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
+        instance = kzalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
         if (!instance) {
                 dev_dbg(dev, "%s: no memory for instance data!\n", __func__);
                 return -ENOMEM;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 79422a3b07bc..12ecdb03ee5f 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -782,7 +782,7 @@ static int usb_register_bus(struct usb_bus *bus)
                 return -E2BIG;
         }
 
-        bus->class_dev = class_device_create(usb_host_class, MKDEV(0,0), bus->controller, "usb%d", busnum);
+        bus->class_dev = class_device_create(usb_host_class, MKDEV(0,0), bus->controller, "usb_host%d", busnum);
         if (IS_ERR(bus->class_dev)) {
                 clear_bit(busnum, busmap.busmap);
                 up(&usb_bus_list_lock);
@@ -1669,7 +1669,7 @@ struct usb_hcd *usb_create_hcd (const struct hc_driver *driver,
 {
         struct usb_hcd *hcd;
 
-        hcd = kcalloc(1, sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL);
+        hcd = kzalloc(sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL);
         if (!hcd) {
                 dev_dbg (dev, "hcd alloc failed\n");
                 return NULL;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index c3e46d24a37e..c9412daff682 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1570,7 +1570,7 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
                         struct usb_driver       *driver;
 
                         intf = udev->actconfig->interface[i];
-                        if (state <= intf->dev.power.power_state)
+                        if (state.event <= intf->dev.power.power_state.event)
                                 continue;
                         if (!intf->dev.driver)
                                 continue;
@@ -1578,11 +1578,11 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
 
                         if (driver->suspend) {
                                 status = driver->suspend(intf, state);
-                                if (intf->dev.power.power_state != state
+                                if (intf->dev.power.power_state.event != state.event
                                                 || status)
                                         dev_err(&intf->dev,
                                                 "suspend %d fail, code %d\n",
-                                                state, status);
+                                                state.event, status);
                         }
 
                         /* only drivers with suspend() can ever resume();
@@ -1595,7 +1595,7 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
                          * since we know every driver's probe/disconnect works
                          * even for drivers that can't suspend.
                          */
-                        if (!driver->suspend || state > PM_SUSPEND_MEM) {
+                        if (!driver->suspend || state.event > PM_EVENT_FREEZE) {
 #if 1
                                 dev_warn(&intf->dev, "resume is unsafe!\n");
 #else
@@ -1616,7 +1616,7 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
          * policies (when HNP doesn't apply) once we have mechanisms to
          * turn power back on!  (Likely not before 2.7...)
          */
-        if (state > PM_SUSPEND_MEM) {
+        if (state.event > PM_EVENT_FREEZE) {
                 dev_warn(&udev->dev, "no poweroff yet, suspending instead\n");
         }
 
@@ -1733,7 +1733,7 @@ static int finish_port_resume(struct usb_device *udev)
                         struct usb_driver       *driver;
 
                         intf = udev->actconfig->interface[i];
-                        if (intf->dev.power.power_state == PMSG_ON)
+                        if (intf->dev.power.power_state.event == PM_EVENT_ON)
                                 continue;
                         if (!intf->dev.driver) {
                                 /* FIXME maybe force to alt 0 */
@@ -1747,11 +1747,11 @@ static int finish_port_resume(struct usb_device *udev)
 
                         /* can we do better than just logging errors? */
                         status = driver->resume(intf);
-                        if (intf->dev.power.power_state != PMSG_ON
+                        if (intf->dev.power.power_state.event != PM_EVENT_ON
                                         || status)
                                 dev_dbg(&intf->dev,
                                         "resume fail, state %d code %d\n",
-                                        intf->dev.power.power_state, status);
+                                        intf->dev.power.power_state.event, status);
                 }
                 status = 0;
 
@@ -1934,7 +1934,7 @@ static int hub_resume(struct usb_interface *intf)
         unsigned                port1;
         int                     status;
 
-        if (intf->dev.power.power_state == PM_SUSPEND_ON)
+        if (intf->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         for (port1 = 1; port1 <= hdev->maxchild; port1++) {
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 99c85d2f92da..2cddd8a00437 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1400,7 +1400,7 @@ static int usb_generic_suspend(struct device *dev, pm_message_t message)
         driver = to_usb_driver(dev->driver);
 
         /* there's only one USB suspend state */
-        if (intf->dev.power.power_state)
+        if (intf->dev.power.power_state.event)
                 return 0;
 
         if (driver->suspend)
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index b01efb6b36f6..65ac9fef3a7c 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -641,7 +641,7 @@ show_registers (struct class_device *class_dev, char *buf)
 
         spin_lock_irqsave (&ehci->lock, flags);
 
-        if (bus->controller->power.power_state) {
+        if (bus->controller->power.power_state.event) {
                 size = scnprintf (next, size,
                         "bus %s, device %s (driver " DRIVER_VERSION ")\n"
                         "%s\n"
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index b56f25864ed6..4c972b57c7c3 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -638,7 +638,7 @@ iso_stream_alloc (unsigned mem_flags)
 {
         struct ehci_iso_stream *stream;
 
-        stream = kcalloc(1, sizeof *stream, mem_flags);
+        stream = kzalloc(sizeof *stream, mem_flags);
         if (likely (stream != NULL)) {
                 INIT_LIST_HEAD(&stream->td_list);
                 INIT_LIST_HEAD(&stream->free_list);
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 76cb496c5836..75128c371800 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -717,7 +717,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,
         }
         /* avoid all allocations within spinlocks: request or endpoint */
         if (!hep->hcpriv) {
-                ep = kcalloc(1, sizeof *ep, mem_flags);
+                ep = kzalloc(sizeof *ep, mem_flags);
                 if (!ep)
                         return -ENOMEM;
         }
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index c58408c95c3d..447f488f5d93 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -631,7 +631,7 @@ show_registers (struct class_device *class_dev, char *buf)
                 hcd->product_desc,
                 hcd_name);
 
-        if (bus->controller->power.power_state) {
+        if (bus->controller->power.power_state.event) {
                 size -= scnprintf (next, size,
                         "SUSPENDED (no register access)\n");
                 goto done;
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 7a890a65f55d..d2a1fd40dfcb 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -835,7 +835,7 @@ static int sl811h_urb_enqueue(
 
         /* avoid all allocations within spinlocks */
         if (!hep->hcpriv)
-                ep = kcalloc(1, sizeof *ep, mem_flags);
+                ep = kzalloc(sizeof *ep, mem_flags);
 
         spin_lock_irqsave(&sl811->lock, flags);
 
@@ -1781,9 +1781,9 @@ sl811h_suspend(struct device *dev, pm_message_t state, u32 phase)
         if (phase != SUSPEND_POWER_DOWN)
                 return retval;
 
-        if (state <= PM_SUSPEND_MEM)
+        if (state.event == PM_EVENT_FREEZE)
                 retval = sl811h_hub_suspend(hcd);
-        else
+        else if (state.event == PM_EVENT_SUSPEND)
                 port_power(sl811, 0);
         if (retval == 0)
                 dev->power.power_state = state;
@@ -1802,7 +1802,7 @@ sl811h_resume(struct device *dev, u32 phase)
         /* with no "check to see if VBUS is still powered" board hook,
          * let's assume it'd only be powered to enable remote wakeup.
          */
-        if (dev->power.power_state > PM_SUSPEND_MEM
+        if (dev->power.power_state.event == PM_EVENT_SUSPEND
                         || !hcd->can_wakeup) {
                 sl811->port1 = 0;
                 port_power(sl811, 1);
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c
index 13532f3e3efc..74f8760d7c07 100644
--- a/drivers/usb/input/acecad.c
+++ b/drivers/usb/input/acecad.c
@@ -152,7 +152,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
         pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
         maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
 
-        acecad = kcalloc(1, sizeof(struct usb_acecad), GFP_KERNEL);
+        acecad = kzalloc(sizeof(struct usb_acecad), GFP_KERNEL);
         if (!acecad)
                 return -ENOMEM;
 
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c
index 0dc439f10823..becb87efb869 100644
--- a/drivers/usb/input/itmtouch.c
+++ b/drivers/usb/input/itmtouch.c
@@ -166,7 +166,7 @@ static int itmtouch_probe(struct usb_interface *intf, const struct usb_device_id
         interface = intf->cur_altsetting;
         endpoint = &interface->endpoint[0].desc;
 
-        if (!(itmtouch = kcalloc(1, sizeof(struct itmtouch_dev), GFP_KERNEL))) {
+        if (!(itmtouch = kzalloc(sizeof(struct itmtouch_dev), GFP_KERNEL))) {
                 err("%s - Out of memory.", __FUNCTION__);
                 return -ENOMEM;
         }
diff --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c
index 256963863478..acc71ec560e9 100644
--- a/drivers/usb/input/pid.c
+++ b/drivers/usb/input/pid.c
@@ -263,7 +263,7 @@ int hid_pid_init(struct hid_device *hid)
         struct hid_ff_pid *private;
         struct hid_input *hidinput = list_entry(&hid->inputs, struct hid_input, list);
 
-        private = hid->ff_private = kcalloc(1, sizeof(struct hid_ff_pid), GFP_KERNEL);
+        private = hid->ff_private = kzalloc(sizeof(struct hid_ff_pid), GFP_KERNEL);
         if (!private)
                 return -ENOMEM;
 
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index ca9f3a30634f..f36c0b6c6e36 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1523,7 +1523,6 @@ static u32 w9968cf_i2c_func(struct i2c_adapter* adap)
 static int w9968cf_i2c_attach_inform(struct i2c_client* client)
 {
         struct w9968cf_device* cam = i2c_get_adapdata(client->adapter);
-        const char* clientname = i2c_clientname(client);
         int id = client->driver->id, err = 0;
 
         if (id == I2C_DRIVERID_OVCAMCHIP) {
@@ -1535,12 +1534,12 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
                 }
         } else {
                 DBG(4, "Rejected client [%s] with driver [%s]", 
-                    clientname, client->driver->name)
+                    client->name, client->driver->name)
                 return -EINVAL;
         }
 
         DBG(5, "I2C attach client [%s] with driver [%s]",
-            clientname, client->driver->name)
+            client->name, client->driver->name)
 
         return 0;
 }
@@ -1549,12 +1548,11 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
 static int w9968cf_i2c_detach_inform(struct i2c_client* client)
 {
         struct w9968cf_device* cam = i2c_get_adapdata(client->adapter);
-        const char* clientname = i2c_clientname(client);
 
         if (cam->sensor_client == client)
                 cam->sensor_client = NULL;
 
-        DBG(5, "I2C detach client [%s]", clientname)
+        DBG(5, "I2C detach client [%s]", client->name)
 
         return 0;
 }
@@ -1573,15 +1571,13 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
         int err = 0;
 
         static struct i2c_algorithm algo = {
-                .name =          "W996[87]CF algorithm",
-                .id =            I2C_ALGO_SMBUS,
                 .smbus_xfer =    w9968cf_i2c_smbus_xfer,
                 .algo_control =  w9968cf_i2c_control,
                 .functionality = w9968cf_i2c_func,
         };
 
         static struct i2c_adapter adap = {
-                .id =                I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF,
+                .id =                I2C_HW_SMBUS_W9968CF,
                 .class =             I2C_CLASS_CAM_DIGITAL,
                 .owner =             THIS_MODULE,
                 .client_register =   w9968cf_i2c_attach_inform,
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index cda7249a90b2..fd7fb98e4b20 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1533,7 +1533,7 @@ usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf)
         if (down_interruptible (&dev->sem))
                 return -ERESTARTSYS;
 
-        if (intf->dev.power.power_state != PMSG_ON) {
+        if (intf->dev.power.power_state.event != PM_EVENT_ON) {
                 up (&dev->sem);
                 return -EHOSTUNREACH;
         }