Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d1165a4 authored by Mian Yousaf Kaukab's avatar Mian Yousaf Kaukab Committed by Felipe Balbi
Browse files

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: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarMian Yousaf Kaukab <yousaf.kaukab@intel.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 96d480e6

drivers/usb/dwc2/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -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

drivers/usb/dwc2/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -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

drivers/usb/dwc2/core.c

+0 −3
Original line number Diff line number Diff line
@@ -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)

drivers/usb/dwc2/core_intr.c

+0 −1
Original line number Diff line number Diff line
@@ -559,4 +559,3 @@ irqreturn_t dwc2_handle_common_intr(int irq, void *dev) 
	spin_unlock(&hsotg->lock);

	return retval;

}
 
EXPORT_SYMBOL_GPL(dwc2_handle_common_intr);

drivers/usb/dwc2/debugfs.c

+0 −2
Original line number Diff line number Diff line
@@ -763,11 +763,9 @@ int dwc2_debugfs_init(struct dwc2_hsotg *hsotg) 
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);