Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

[pandora-kernel.git] / drivers / usb / host / ohci-pnx4008.c

diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index 28b458f..6ad8f2f 100644 (file)
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -109,8 +109,6 @@ static struct clk *usb_clk;
 
 static int isp1301_probe(struct i2c_adapter *adap);
 static int isp1301_detach(struct i2c_client *client);
-static int isp1301_command(struct i2c_client *client, unsigned int cmd,
-                          void *arg);
 
 static const unsigned short normal_i2c[] =
     { ISP1301_I2C_ADDR, ISP1301_I2C_ADDR + 1, I2C_CLIENT_END };
@@ -123,30 +121,37 @@ static struct i2c_client_address_data addr_data = {
 };
 
 struct i2c_driver isp1301_driver = {
-       .class = I2C_CLASS_HWMON,
+       .driver = {
+               .name = "isp1301_pnx",
+       },
        .attach_adapter = isp1301_probe,
        .detach_client = isp1301_detach,
-       .command = isp1301_command
 };
 
 static int isp1301_attach(struct i2c_adapter *adap, int addr, int kind)
 {
        struct i2c_client *c;
+       int err;
 
        c = kzalloc(sizeof(*c), GFP_KERNEL);
-
        if (!c)
                return -ENOMEM;
 
-       strcpy(c->name, "isp1301");
+       strlcpy(c->name, "isp1301_pnx", I2C_NAME_SIZE);
        c->flags = 0;
        c->addr = addr;
        c->adapter = adap;
        c->driver = &isp1301_driver;
 
+       err = i2c_attach_client(c);
+       if (err) {
+               kfree(c);
+               return err;
+       }
+
        isp1301_i2c_client = c;
 
-       return i2c_attach_client(c);
+       return 0;
 }
 
 static int isp1301_probe(struct i2c_adapter *adap)
@@ -161,13 +166,6 @@ static int isp1301_detach(struct i2c_client *client)
        return 0;
 }
 
-/* No commands defined */
-static int isp1301_command(struct i2c_client *client, unsigned int cmd,
-                          void *arg)
-{
-       return 0;
-}
-
 static void i2c_write(u8 buf, u8 subaddr)
 {
        char tmpbuf[2];
@@ -389,7 +387,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
        while ((__raw_readl(USB_OTG_CLK_STAT) & USB_CLOCK_MASK) !=
               USB_CLOCK_MASK) ;
 
-       hcd = usb_create_hcd (driver, &pdev->dev, pdev->dev.bus_id);
+       hcd = usb_create_hcd (driver, &pdev->dev, dev_name(&pdev->dev));
        if (!hcd) {
                err("Failed to allocate HC buffer");
                ret = -ENOMEM;