redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Mian Yousaf Kaukab 2015-04-29 22:09:18 +02:00 committed by Felipe Balbi
parent 96d480e65e
commit 2d1165a4b9
7 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/dwc2/Kconfig
View File

@ -50,18 +50,10 @@ config USB_DWC2_DUAL_ROLE
option requires USB_GADGET to be enabled. option requires USB_GADGET to be enabled.
endchoice 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 config USB_DWC2_PCI
tristate "DWC2 PCI" tristate "DWC2 PCI"
depends on PCI depends on PCI
default n default n
select USB_DWC2_PLATFORM
select NOP_USB_XCEIV select NOP_USB_XCEIV
help help
The Designware USB2.0 PCI interface module for controllers The Designware USB2.0 PCI interface module for controllers

5
drivers/usb/dwc2/Makefile
View File

@ -2,7 +2,7 @@ ccflags-$(CONFIG_USB_DWC2_DEBUG) += -DDEBUG
ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG
obj-$(CONFIG_USB_DWC2) += dwc2.o 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)),) ifneq ($(filter y,$(CONFIG_USB_DWC2_HOST) $(CONFIG_USB_DWC2_DUAL_ROLE)),)
dwc2-y += hcd.o hcd_intr.o dwc2-y += hcd.o hcd_intr.o
@ -25,6 +25,3 @@ endif
obj-$(CONFIG_USB_DWC2_PCI) += dwc2_pci.o obj-$(CONFIG_USB_DWC2_PCI) += dwc2_pci.o
dwc2_pci-y := pci.o dwc2_pci-y := pci.o
obj-$(CONFIG_USB_DWC2_PLATFORM) += dwc2_platform.o
dwc2_platform-y := platform.o

3
drivers/usb/dwc2/core.c
View File

@ -3044,7 +3044,6 @@ void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
dwc2_set_param_uframe_sched(hsotg, params->uframe_sched); dwc2_set_param_uframe_sched(hsotg, params->uframe_sched);
dwc2_set_param_external_id_pin_ctl(hsotg, params->external_id_pin_ctl); 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 * During device initialization, read various hardware configuration
@ -3211,7 +3210,6 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(dwc2_get_hwparams);
/* /*
* Sets all parameters to the given value. * 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++) for (i = 0; i < size; i++)
p[i] = value; p[i] = value;
} }
EXPORT_SYMBOL_GPL(dwc2_set_all_params);
u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg) u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg)

1
drivers/usb/dwc2/core_intr.c
View File

@ -559,4 +559,3 @@ out:
spin_unlock(&hsotg->lock); spin_unlock(&hsotg->lock);
return retval; return retval;
} }
EXPORT_SYMBOL_GPL(dwc2_handle_common_intr);

2
drivers/usb/dwc2/debugfs.c
View File

@ -763,11 +763,9 @@ err1:
err0: err0:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(dwc2_debugfs_init);
void dwc2_debugfs_exit(struct dwc2_hsotg *hsotg) void dwc2_debugfs_exit(struct dwc2_hsotg *hsotg)
{ {
debugfs_remove_recursive(hsotg->debug_root); debugfs_remove_recursive(hsotg->debug_root);
hsotg->debug_root = NULL; hsotg->debug_root = NULL;
} }
EXPORT_SYMBOL_GPL(dwc2_debugfs_exit);

5
drivers/usb/dwc2/gadget.c
View File

@ -2190,7 +2190,6 @@ void s3c_hsotg_disconnect(struct dwc2_hsotg *hsotg)
call_gadget(hsotg, disconnect); call_gadget(hsotg, disconnect);
} }
EXPORT_SYMBOL_GPL(s3c_hsotg_disconnect);
/** /**
* s3c_hsotg_irq_fifoempty - TX FIFO empty interrupt handler * s3c_hsotg_irq_fifoempty - TX FIFO empty interrupt handler
@ -3666,7 +3665,6 @@ err_clk:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(dwc2_gadget_init);
/** /**
* s3c_hsotg_remove - remove function for hsotg driver * s3c_hsotg_remove - remove function for hsotg driver
@ -3679,7 +3677,6 @@ int s3c_hsotg_remove(struct dwc2_hsotg *hsotg)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(s3c_hsotg_remove);
int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg) int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg)
{ {
@ -3722,7 +3719,6 @@ int s3c_hsotg_suspend(struct dwc2_hsotg *hsotg)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(s3c_hsotg_suspend);
int s3c_hsotg_resume(struct dwc2_hsotg *hsotg) int s3c_hsotg_resume(struct dwc2_hsotg *hsotg)
{ {
@ -3754,4 +3750,3 @@ int s3c_hsotg_resume(struct dwc2_hsotg *hsotg)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(s3c_hsotg_resume);

2
drivers/usb/dwc2/hcd.c
View File

@ -2980,7 +2980,6 @@ error1:
dev_err(hsotg->dev, "%s() FAILED, returning %d\n", __func__, retval); dev_err(hsotg->dev, "%s() FAILED, returning %d\n", __func__, retval);
return retval; return retval;
} }
EXPORT_SYMBOL_GPL(dwc2_hcd_init);
/* /*
* Removes the HCD. * Removes the HCD.
@ -3014,4 +3013,3 @@ void dwc2_hcd_remove(struct dwc2_hsotg *hsotg)
kfree(hsotg->frame_num_array); kfree(hsotg->frame_num_array);
#endif #endif
} }
EXPORT_SYMBOL_GPL(dwc2_hcd_remove);