aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/renesas_usbhs/rcar3.h
diff options
context:
space:
mode:
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>2019-06-25 14:38:56 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-26 10:33:09 +0800
commit76eff170bb05e59218008a21df670cb7177110e4 (patch)
treee2a0eb748d3e51e9689b243459354621549404e2 /drivers/usb/renesas_usbhs/rcar3.h
parentusb: renesas_usbhs: Add a common function for the .get_id (diff)
downloadlinux-dev-76eff170bb05e59218008a21df670cb7177110e4.tar.xz
linux-dev-76eff170bb05e59218008a21df670cb7177110e4.zip
usb: renesas_usbhs: Use renesas_usbhs_platform_info on of_device_id.data
In device tree environment, the previous code allocates renesas_usbhs_platform_info by using devm_kzalloc() and then copies usbhs_of_data to the allocated memory. This reason is some values (e.g. .platform_callback.get_vbus) are overwritten by the driver, but the of_device_id.data is "const". Now the driver doesn't have such a code, so this patch uses renesas_usbhs_platform_info on of_device_id.data. Note that the previous code set the pdev->dev.platform_data pointer even if device tree environment, but the value is not used. So, this patch also remove such a code. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/renesas_usbhs/rcar3.h')
-rw-r--r--drivers/usb/renesas_usbhs/rcar3.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/renesas_usbhs/rcar3.h b/drivers/usb/renesas_usbhs/rcar3.h
index 49e535a31771..c7c5ec1e3af2 100644
--- a/drivers/usb/renesas_usbhs/rcar3.h
+++ b/drivers/usb/renesas_usbhs/rcar3.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "common.h"
-extern const struct renesas_usbhs_platform_callback usbhs_rcar3_ops;
-extern const struct renesas_usbhs_platform_callback usbhs_rcar3_with_pll_ops;
+extern const struct renesas_usbhs_platform_info usbhs_rcar_gen3_plat_info;
+extern const struct renesas_usbhs_platform_info
+ usbhs_rcar_gen3_with_pll_plat_info;