From 61d51ca125f216b3ca7ca349e3a4c34828446e60 Mon Sep 17 00:00:00 2001 From: Chandler Zhang Date: Thu, 21 Jun 2012 11:37:22 +0800 Subject: usb: otg: remove otg callback Previously the callback was added to control USB VBUS. The standard way is to use regulator. Bug 997805 Change-Id: I88b15befaf4e162478da19ead50695978b2c5f4b Signed-off-by: Chandler Zhang Reviewed-on: http://git-master/r/112901 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Syed Rafiuddin Reviewed-by: Sachin Nikam --- drivers/usb/otg/tegra-otg.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'drivers/usb/otg') diff --git a/drivers/usb/otg/tegra-otg.c b/drivers/usb/otg/tegra-otg.c index 081ad209e41c..ee76e6d8f58f 100644 --- a/drivers/usb/otg/tegra-otg.c +++ b/drivers/usb/otg/tegra-otg.c @@ -3,7 +3,7 @@ * * OTG transceiver driver for Tegra UTMI phy * - * Copyright (C) 2010 NVIDIA Corp. + * Copyright (C) 2010-2012 NVIDIA CORPORATION. All rights reserved. * Copyright (C) 2010 Google, Inc. * * This program is free software; you can redistribute it and/or modify it @@ -43,9 +43,6 @@ #define USB_INT_EN (USB_VBUS_INT_EN | USB_ID_INT_EN | \ USB_VBUS_WAKEUP_EN | USB_ID_PIN_WAKEUP_EN) -typedef void (*callback_t)(enum usb_otg_state to, - enum usb_otg_state from, void *args); - #ifdef DEBUG #define DBG(stuff...) pr_info("tegra-otg: " stuff) #else @@ -63,8 +60,6 @@ struct tegra_otg_data { struct work_struct work; unsigned int intr_reg_data; bool clk_enabled; - callback_t charger_cb; - void *charger_cb_data; bool interrupt_mode; bool builtin_host; bool suspended @@ -186,15 +181,6 @@ static void tegra_stop_host(struct tegra_otg_data *tegra) DBG("%s(%d) End\n", __func__, __LINE__); } -int register_otg_callback(callback_t cb, void *args) -{ - if (!tegra_clone) - return -ENODEV; - tegra_clone->charger_cb = cb; - tegra_clone->charger_cb_data = args; - return 0; -} -EXPORT_SYMBOL_GPL(register_otg_callback); static void tegra_change_otg_state(struct tegra_otg_data *tegra, enum usb_otg_state to) @@ -215,9 +201,6 @@ static void tegra_change_otg_state(struct tegra_otg_data *tegra, dev_info(tegra->otg.dev, "%s --> %s\n", tegra_state_name(from), tegra_state_name(to)); - if (tegra->charger_cb) - tegra->charger_cb(to, from, tegra->charger_cb_data); - if (from == OTG_STATE_A_SUSPEND) { if (to == OTG_STATE_B_PERIPHERAL && otg->gadget) usb_gadget_vbus_connect(otg->gadget); -- cgit v1.2.3