From: Felipe Balbi <felipe.lima@xxxxxxxxxxx>
Put comments in a better shape.
Signed-off-by: Felipe Balbi <felipe.lima@xxxxxxxxxxx>
---
drivers/i2c/chips/isp1301_omap.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 5fb27cb..4562335 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -278,7 +278,7 @@ static void power_down(struct isp1301 *isp)
{
isp->otg.state = OTG_STATE_UNDEFINED;
- // isp1301_set_bits(isp, ISP1301_MODE_CONTROL_2, MC2_GLOBAL_PWR_DN);
+ /* isp1301_set_bits(isp, ISP1301_MODE_CONTROL_2, MC2_GLOBAL_PWR_DN); */
isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_SUSPEND_REG);
isp1301_clear_bits(isp, ISP1301_OTG_CONTROL_1, OTG1_ID_PULLDOWN);
@@ -287,7 +287,7 @@ static void power_down(struct isp1301 *isp)
static void power_up(struct isp1301 *isp)
{
- // isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_2, MC2_GLOBAL_PWR_DN);
+ /* isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_2, MC2_GLOBAL_PWR_DN); */
isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_1, MC1_SUSPEND_REG);
/* do this only when cpu is driving transceiver,
@@ -578,7 +578,7 @@ static void otg_update_isp(struct isp1301 *isp)
case OTG_STATE_B_PERIPHERAL:
case OTG_STATE_B_SRP_INIT:
if (!(otg_ctrl & OTG_PULLUP)) {
- // if (otg_ctrl & OTG_B_HNPEN) {
+ /* if (otg_ctrl & OTG_B_HNPEN) { */
if (isp->otg.gadget->b_hnp_enable) {
isp->otg.state = OTG_STATE_B_WAIT_ACON;
pr_debug(" --> b_wait_acon\n");
@@ -594,7 +594,7 @@ pullup:
if (otg_ctrl & OTG_PULLUP)
goto pullup;
/* FALLTHROUGH */
- // case OTG_STATE_B_WAIT_ACON:
+ /* case OTG_STATE_B_WAIT_ACON: */
default:
pulldown:
set |= OTG1_DP_PULLDOWN;
@@ -852,7 +852,7 @@ static int otg_init(struct isp1301 *isp)
/* for B-device: */
| SRP_GPDATA /* 9msec Bdev D+ pulse */
| SRP_GPDVBUS /* discharge after VBUS pulse */
- // | (3 << 24) /* 2msec VBUS pulse */
+ /* | (3 << 24) */ /* 2msec VBUS pulse */
/* for A-device: */
| (0 << 20) /* 200ms nominal A_WAIT_VRISE timer */
| SRP_DPW /* detect 167+ns SRP pulses */
@@ -876,7 +876,7 @@ static int otg_init(struct isp1301 *isp)
static int otg_probe(struct platform_device *dev)
{
- // struct omap_usb_config *config = dev->platform_data;
+ /* struct omap_usb_config *config = dev->platform_data; */
otg_dev = dev;
return 0;
@@ -1084,7 +1084,7 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
/* update the OTG controller state to match the isp1301; may
* trigger OPRT_CHG irqs for changes going to the isp1301.
*/
- update_otg1(isp, stat); // pass the actual interrupt latch status
+ update_otg1(isp, stat); /* pass the actual interrupt latch status */
update_otg2(isp, isp_bstat);
check_state(isp, __FUNCTION__);
#endif
@@ -1158,7 +1158,7 @@ isp1301_work(struct work_struct *work)
state_name(isp));
}
host_resume(isp);
- // mdelay(10);
+ /* mdelay(10); */
put_device(&isp->client->dev);
}
@@ -1297,7 +1297,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
return 0;
#elif !defined(CONFIG_USB_GADGET_OMAP)
- // FIXME update its refcount
+ /* FIXME update its refcount */
isp->otg.host = host;
power_up(isp);
@@ -1354,7 +1354,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
#elif !defined(CONFIG_USB_OHCI_HCD) && !defined(CONFIG_USB_OHCI_HCD_MODULE)
isp->otg.gadget = gadget;
- // FIXME update its refcount
+ /* FIXME update its refcount */
OTG_CTRL_REG = (OTG_CTRL_REG & OTG_CTRL_MASK
& ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS))
@@ -1362,7 +1362,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
power_up(isp);
isp->otg.state = OTG_STATE_B_IDLE;
-// XXX h4 too?
+/* XXX h4 too? */
if (machine_is_omap_h2() || machine_is_omap_h3())
isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0);
--
1.5.3.7.1157.gbf82a
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
