USB: ohci-nxp: Remove i2c_write(), use smbus

This patch removes the re-coded i2c_write function from the ohci-nxp driver
in favour of using just smbus functions.

Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index e7cc7b6332145a180d6b0614c005d6303da0f316..6618de1d881d1a36ad561900c5666f2a0889bb3b 100644 (file)
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -149,38 +149,36 @@ static struct i2c_driver isp1301_driver = {
        .id_table = isp1301_id,
 };
 
-static void i2c_write(u8 buf, u8 subaddr)
-{
-       char tmpbuf[2];
-
-       tmpbuf[0] = subaddr;    /*register number */
-       tmpbuf[1] = buf;        /*register data */
-       i2c_master_send(isp1301_i2c_client, &tmpbuf[0], 2);
-}
-
 static void isp1301_configure_pnx4008(void)
 {
        /* PNX4008 only supports DAT_SE0 USB mode */
        /* PNX4008 R2A requires setting the MAX603 to output 3.6V */
        /* Power up externel charge-pump */
 
-       i2c_write(MC1_DAT_SE0 | MC1_SPEED_REG, ISP1301_I2C_MODE_CONTROL_1);
-       i2c_write(~(MC1_DAT_SE0 | MC1_SPEED_REG),
-                 ISP1301_I2C_MODE_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR);
-       i2c_write(MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL,
-                 ISP1301_I2C_MODE_CONTROL_2);
-       i2c_write(~(MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL),
-                 ISP1301_I2C_MODE_CONTROL_2 | ISP1301_I2C_REG_CLEAR_ADDR);
-       i2c_write(OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN,
-                 ISP1301_I2C_OTG_CONTROL_1);
-       i2c_write(~(OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN),
-                 ISP1301_I2C_OTG_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR);
-       i2c_write(0xFF,
-                 ISP1301_I2C_INTERRUPT_LATCH | ISP1301_I2C_REG_CLEAR_ADDR);
-       i2c_write(0xFF,
-                 ISP1301_I2C_INTERRUPT_FALLING | ISP1301_I2C_REG_CLEAR_ADDR);
-       i2c_write(0xFF,
-                 ISP1301_I2C_INTERRUPT_RISING | ISP1301_I2C_REG_CLEAR_ADDR);
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_MODE_CONTROL_1, MC1_DAT_SE0 | MC1_SPEED_REG);
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_MODE_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR,
+               ~(MC1_DAT_SE0 | MC1_SPEED_REG));
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_MODE_CONTROL_2,
+               MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL);
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_MODE_CONTROL_2 | ISP1301_I2C_REG_CLEAR_ADDR,
+               ~(MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL));
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_OTG_CONTROL_1, OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN);
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_OTG_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR,
+               ~(OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN));
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_INTERRUPT_LATCH | ISP1301_I2C_REG_CLEAR_ADDR, 0xFF);
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_INTERRUPT_FALLING | ISP1301_I2C_REG_CLEAR_ADDR,
+               0xFF);
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_INTERRUPT_RISING | ISP1301_I2C_REG_CLEAR_ADDR,
+               0xFF);
 }
 
 static void isp1301_configure_lpc32xx(void)
@@ -242,13 +240,15 @@ static void isp1301_configure(void)
 
 static inline void isp1301_vbus_on(void)
 {
-       i2c_write(OTG1_VBUS_DRV, ISP1301_I2C_OTG_CONTROL_1);
+       i2c_smbus_write_byte_data(isp1301_i2c_client, ISP1301_I2C_OTG_CONTROL_1,
+                                 OTG1_VBUS_DRV);
 }
 
 static inline void isp1301_vbus_off(void)
 {
-       i2c_write(OTG1_VBUS_DRV,
-                 ISP1301_I2C_OTG_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR);
+       i2c_smbus_write_byte_data(isp1301_i2c_client,
+               ISP1301_I2C_OTG_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR,
+               OTG1_VBUS_DRV);
 }
 
 static void nxp_start_hc(void)