Merge "defconfig: 8909w: Disable USB HOST drivers" (ddd62963) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/configs/msm8909w-perf_defconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -234,7 +234,6 @@ CONFIG_PPPOLAC=y
		CONFIG_PPPOPNS=y
		CONFIG_PPP_ASYNC=y
		CONFIG_PPP_SYNC_TTY=y
		CONFIG_USB_USBNET=y
		CONFIG_WCNSS_CORE=y
		CONFIG_WCNSS_CORE_PRONTO=y
		CONFIG_WCNSS_REGISTER_DUMP_ON_BITE=y
		@@ -338,18 +337,9 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
		# CONFIG_BACKLIGHT_GENERIC is not set
		CONFIG_SOUND=y
		CONFIG_SND=y
		CONFIG_SND_USB_AUDIO=y
		CONFIG_SND_SOC=y
		CONFIG_SND_SOC_MSM8909=y
		CONFIG_UHID=y
		CONFIG_USB=y
		CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
		CONFIG_USB_MON=y
		CONFIG_USB_EHCI_HCD=y
		CONFIG_USB_EHCI_MSM=y
		CONFIG_USB_ACM=y
		CONFIG_USB_SERIAL=y
		CONFIG_USB_EHSET_TEST_FIXTURE=y
		CONFIG_USB_GADGET=y
		CONFIG_USB_GADGET_DEBUG_FILES=y
		CONFIG_USB_GADGET_DEBUG_FS=y

arch/arm/configs/msm8909w_defconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -237,7 +237,6 @@ CONFIG_PPPOLAC=y
		CONFIG_PPPOPNS=y
		CONFIG_PPP_ASYNC=y
		CONFIG_PPP_SYNC_TTY=y
		CONFIG_USB_USBNET=y
		CONFIG_WCNSS_CORE=y
		CONFIG_WCNSS_CORE_PRONTO=y
		CONFIG_WCNSS_REGISTER_DUMP_ON_BITE=y
		@@ -344,18 +343,9 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
		# CONFIG_BACKLIGHT_GENERIC is not set
		CONFIG_SOUND=y
		CONFIG_SND=y
		CONFIG_SND_USB_AUDIO=y
		CONFIG_SND_SOC=y
		CONFIG_SND_SOC_MSM8909=y
		CONFIG_UHID=y
		CONFIG_USB=y
		CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
		CONFIG_USB_MON=y
		CONFIG_USB_EHCI_HCD=y
		CONFIG_USB_EHCI_MSM=y
		CONFIG_USB_ACM=y
		CONFIG_USB_SERIAL=y
		CONFIG_USB_EHSET_TEST_FIXTURE=y
		CONFIG_USB_GADGET=y
		CONFIG_USB_GADGET_DEBUG_FILES=y
		CONFIG_USB_GADGET_DEBUG_FS=y

include/linux/usb/hcd.h

+23 −12

Original line number	Diff line number	Diff line
		@@ -434,9 +434,6 @@ extern struct usb_hcd usb_create_shared_hcd(const struct hc_driver driver,
		extern struct usb_hcd usb_get_hcd(struct usb_hcd hcd);
		extern void usb_put_hcd(struct usb_hcd *hcd);
		extern int usb_hcd_is_primary_hcd(struct usb_hcd *hcd);
		extern int usb_add_hcd(struct usb_hcd *hcd,
		unsigned int irqnum, unsigned long irqflags);
		extern void usb_remove_hcd(struct usb_hcd *hcd);
		extern int usb_hcd_find_raw_port_number(struct usb_hcd *hcd, int port1);

		struct platform_device;
		@@ -636,15 +633,6 @@ extern int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg);
		extern int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg);
		#endif /* CONFIG_PM */

		#ifdef CONFIG_PM_RUNTIME
		extern void usb_hcd_resume_root_hub(struct usb_hcd *hcd);
		#else
		static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd)
		{
		return;
		}
		#endif /* CONFIG_PM_RUNTIME */

		/-------------------------------------------------------------------------/

		#if defined(CONFIG_USB_MON) \|\| defined(CONFIG_USB_MON_MODULE)
		@@ -710,6 +698,29 @@ extern struct rw_semaphore ehci_cf_port_reset_rwsem;
		#define USB_EHCI_LOADED 2
		extern unsigned long usb_hcds_loaded;

		#ifdef CONFIG_USB
		extern int usb_add_hcd(struct usb_hcd *hcd,
		unsigned int irqnum, unsigned long irqflags);
		extern void usb_remove_hcd(struct usb_hcd *hcd);
		#ifdef CONFIG_PM_RUNTIME
		extern void usb_hcd_resume_root_hub(struct usb_hcd *hcd);
		#else
		static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd) {}
		#endif /* CONFIG_PM_RUNTIME */

		#else /* CONFIG_USB */

		static inline int usb_add_hcd(struct usb_hcd *hcd,
		unsigned int irqnum, unsigned long irqflags)
		{
		return 0;
		}

		static inline void usb_remove_hcd(struct usb_hcd *hcd) {}
		static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd) {}

		#endif /* CONFIG_USB */

		#endif /* __KERNEL__ */

		#endif /* __USB_CORE_HCD_H */