usb: dwc2: remove dwc2_platform.ko

As dwc2 pci module is now exporting dwc2 platform device, include
platform.o in dwc2-y and remove USB_DWC2_PLATFORM configuration
option. Driver will be built as two modules, dwc2.ko and dwc2_pci.ko.
dwc2.ko is the new platform driver.

Remove all EXPORT_SYMBOL_GPL as they are not needed any more.

Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig
index 1bcb36ae6505afc9cff52f218d396271f763d542..fd95ba6ec317fdacb13478d84c4157656893740c 100644 (file)
--- a/drivers/usb/dwc2/Kconfig
+++ b/drivers/usb/dwc2/Kconfig
@@ -50,18 +50,10 @@ config USB_DWC2_DUAL_ROLE
          option requires USB_GADGET to be enabled.
 endchoice
 
-config USB_DWC2_PLATFORM
-       tristate "DWC2 Platform"
-       default USB_DWC2_HOST || USB_DWC2_PERIPHERAL
-        help
-          The Designware USB2.0 platform interface module for
-          controllers directly connected to the CPU.
-
 config USB_DWC2_PCI
        tristate "DWC2 PCI"
        depends on PCI
        default n
-       select USB_DWC2_PLATFORM
        select NOP_USB_XCEIV
        help
          The Designware USB2.0 PCI interface module for controllers

diff --git a/drivers/usb/dwc2/Makefile b/drivers/usb/dwc2/Makefile
index 324fbb40aa05be7ee7074aa572272c76d0dc4d27..50fdaace1e735f1f9a989bdebb0977a4224d8a44 100644 (file)
--- a/drivers/usb/dwc2/Makefile
+++ b/drivers/usb/dwc2/Makefile
@@ -2,7 +2,7 @@ ccflags-$(CONFIG_USB_DWC2_DEBUG)        += -DDEBUG
 ccflags-$(CONFIG_USB_DWC2_VERBOSE)     += -DVERBOSE_DEBUG
 
 obj-$(CONFIG_USB_DWC2)                 += dwc2.o
-dwc2-y                                 := core.o core_intr.o
+dwc2-y                                 := core.o core_intr.o platform.o
 
 ifneq ($(filter y,$(CONFIG_USB_DWC2_HOST) $(CONFIG_USB_DWC2_DUAL_ROLE)),)
        dwc2-y                          += hcd.o hcd_intr.o
@@ -25,6 +25,3 @@ endif
 
 obj-$(CONFIG_USB_DWC2_PCI)             += dwc2_pci.o
 dwc2_pci-y                             := pci.o
-
-obj-$(CONFIG_USB_DWC2_PLATFORM)                += dwc2_platform.o
-dwc2_platform-y                                := platform.o

diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 6acbe90a78cc7a3bc6668727188e571aca1ec8b3..7f461e3bc7a174a67191258b78a04b79b8180d95 100644 (file)
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -3044,7 +3044,6 @@ void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
        dwc2_set_param_uframe_sched(hsotg, params->uframe_sched);
        dwc2_set_param_external_id_pin_ctl(hsotg, params->external_id_pin_ctl);
 }
-EXPORT_SYMBOL_GPL(dwc2_set_parameters);
 
 /**
  * During device initialization, read various hardware configuration
@@ -3211,7 +3210,6 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(dwc2_get_hwparams);
 
 /*
  * Sets all parameters to the given value.
@@ -3227,7 +3225,6 @@ void dwc2_set_all_params(struct dwc2_core_params *params, int value)
        for (i = 0; i < size; i++)
                p[i] = value;
 }
-EXPORT_SYMBOL_GPL(dwc2_set_all_params);
 
 
 u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg)

diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
index 0b7f2b2e580e04a4b33bbfce3369fcbf57f1b094..9e510bb612bdc8c4aebdd86d6af2ce8d803832b4 100644 (file)
--- a/drivers/usb/dwc2/core_intr.c
+++ b/drivers/usb/dwc2/core_intr.c
@@ -559,4 +559,3 @@ out:
        spin_unlock(&hsotg->lock);
        return retval;
 }
-EXPORT_SYMBOL_GPL(dwc2_handle_common_intr);

diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
index af89537872a3e9642930495ae3e7bce4c78a3128..ef2ee3d9a25d2e37a47028f53793ef077b857015 100644 (file)
--- a/drivers/usb/dwc2/debugfs.c
+++ b/drivers/usb/dwc2/debugfs.c
@@ -763,11 +763,9 @@ err1:
 err0:
        return ret;
 }
-EXPORT_SYMBOL_GPL(dwc2_debugfs_init);
 
 void dwc2_debugfs_exit(struct dwc2_hsotg *hsotg)
 {
        debugfs_remove_recursive(hsotg->debug_root);
        hsotg->debug_root = NULL;
 }
-EXPORT_SYMBOL_GPL(dwc2_debugfs_exit);

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 2b736156fbf084473ecd1dd60b96fdf52c6d79bc..4d47b7c092387fbbf672d9fb5b536ad94633a57c 100644 (file)
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2190,7 +2190,6 @@ void s3c_hsotg_disconnect(struct dwc2_hsotg *hsotg)
 
        call_gadget(hsotg, disconnect);
 }
-EXPORT_SYMBOL_GPL(s3c_hsotg_disconnect);
 
 /**
  * s3c_hsotg_irq_fifoempty - TX FIFO empty interrupt handler
@@ -3666,7 +3665,6 @@ err_clk:
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(dwc2_gadget_init);
 
 /**
  * s3c_hsotg_remove - remove function for hsotg driver
@@ -3679,7 +3677,6 @@ int s3c_hsotg_remove(struct dwc2_hsotg *hsotg)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(s3c_hsotg_remove);
 
 int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg)
 {
@@ -3722,7 +3719,6 @@ int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg)
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(s3c_hsotg_suspend);
 
 int s3c_hsotg_resume(struct dwc2_hsotg *hsotg)
 {
@@ -3754,4 +3750,3 @@ int s3c_hsotg_resume(struct dwc2_hsotg *hsotg)
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(s3c_hsotg_resume);

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 4773d2770363cea8f5ae7c12bae92c88547c67e9..d9b8cc36de529b5762e6e77c5e56c3923b1c52d0 100644 (file)
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -2980,7 +2980,6 @@ error1:
        dev_err(hsotg->dev, "%s() FAILED, returning %d\n", __func__, retval);
        return retval;
 }
-EXPORT_SYMBOL_GPL(dwc2_hcd_init);
 
 /*
  * Removes the HCD.
@@ -3014,4 +3013,3 @@ void dwc2_hcd_remove(struct dwc2_hsotg *hsotg)
        kfree(hsotg->frame_num_array);
 #endif
 }
-EXPORT_SYMBOL_GPL(dwc2_hcd_remove);