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

Commit 93ab52c1 authored by Sundara Vinayagam's avatar Sundara Vinayagam
Browse files

usb: gadget: Fix ci13xxx compilation issues 



Resolved compilation dependencies.

Change-Id: Ic83489eb781db1dfd6cc5f1c4f961dc18ba96d4b
Signed-off-by: default avatarSundara Vinayagam <sundvi@codeaurora.org>
parent de1325b7

include/linux/ipa.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1668,7 +1668,7 @@ static inline int ipa_cfg_ep_nat(u32 clnt_hdl, 
static inline int ipa_cfg_ep_conn_track(u32 clnt_hdl,

	const struct ipa_ep_cfg_conn_track *ep_conn_track)

{

	return -EPERM

	return -EPERM;

}



static inline int ipa_cfg_ep_hdr(u32 clnt_hdl,

include/linux/usb/hcd.h

+10 −1
Original line number Diff line number Diff line
@@ -664,6 +664,7 @@ extern wait_queue_head_t usb_kill_urb_queue; 


#define usb_endpoint_out(ep_dir)	(!((ep_dir) & USB_DIR_IN))



#ifdef CONFIG_USB

#ifdef CONFIG_PM

extern void usb_root_hub_lost_power(struct usb_device *rhdev);

extern int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg);
@@ -675,7 +676,15 @@ static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd) 
	return;

}

#endif /* CONFIG_PM */



#else  /* CONFIG_USB */

extern int usb_add_hcd(struct usb_hcd *hcd,

		unsigned int irqnum, unsigned long irqflags)

{

	return 0;

}

extern void usb_remove_hcd(struct usb_hcd *hcd) {}

extern void usb_hcd_resume_root_hub(struct usb_hcd *hcd) {}

#endif /* CONFIG_USB */

/*-------------------------------------------------------------------------*/



#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)

include/linux/usb/msm_hsusb.h

+0 −5
Original line number Diff line number Diff line
@@ -292,14 +292,9 @@ struct ci13xxx_platform_data { 


#ifdef CONFIG_USB_BAM

void msm_bam_set_usb_host_dev(struct device *dev);

bool msm_usb_bam_enable(enum usb_ctrl ctrl, bool bam_enable);

int msm_do_bam_disable_enable(enum usb_ctrl ctrl);

#else

static inline void msm_bam_set_usb_host_dev(struct device *dev) {}

static inline bool msm_usb_bam_enable(enum usb_ctrl ctrl, bool bam_enable)

{

	return true;

}

int msm_do_bam_disable_enable(enum usb_ctrl ctrl) { return true; }

#endif

#ifdef CONFIG_USB_CI13XXX_MSM