diff options
| author | Jason Liu <jason.hui@linaro.org> | 2011-12-14 22:03:31 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 21:10:15 +0800 |
| commit | 4d5f2a87940d5e2779d1786404a37f89c42c08a6 (patch) | |
| tree | 31d57e6d8d6a91628a3c5465deda021586e5a7cd /drivers/usb | |
| parent | 830be05861d77f0000b1fe6424eecdacfedffd5a (diff) | |
build fix and driver fix
Signed-off-by: Jason Liu <jason.hui@linaro.org>
Diffstat (limited to 'drivers/usb')
| -rwxr-xr-x | drivers/usb/host/ehci-arc.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ehci.h | 4 | ||||
| -rwxr-xr-x | drivers/usb/otg/fsl_otg.c | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/drivers/usb/host/ehci-arc.c b/drivers/usb/host/ehci-arc.c index 5ccfdf8e7b2e..641927339a9f 100755 --- a/drivers/usb/host/ehci-arc.c +++ b/drivers/usb/host/ehci-arc.c @@ -502,7 +502,7 @@ static int ehci_fsl_setup(struct usb_hcd *hcd) /* EHCI registers start at offset 0x100 */ ehci->caps = hcd->regs + 0x100; ehci->regs = hcd->regs + 0x100 + - HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase)); + HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); dbg_hcs_params(ehci, "reset"); dbg_hcc_params(ehci, "reset"); diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index c208d0b7dd0e..dd493a6c31d6 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -176,10 +176,6 @@ struct ehci_hcd { /* one per controller */ #ifdef DEBUG struct dentry *debug_dir; #endif - /* - * OTG controllers and transceivers need software interaction - */ - struct otg_transceiver *transceiver; }; /* convert between an HCD pointer and the corresponding EHCI_HCD */ diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c index be8e0160a197..7ee9fcad8d5e 100755 --- a/drivers/usb/otg/fsl_otg.c +++ b/drivers/usb/otg/fsl_otg.c @@ -27,7 +27,6 @@ #include <linux/ioport.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/proc_fs.h> #include <linux/errno.h> #include <linux/init.h> @@ -802,9 +801,9 @@ irqreturn_t fsl_otg_isr_gpio(int irq, void *dev_id) value = gpio_get_value(pdata->id_gpio) ? 1 : 0; if (value) - set_irq_type(gpio_to_irq(pdata->id_gpio), IRQ_TYPE_LEVEL_LOW); + irq_set_irq_type(gpio_to_irq(pdata->id_gpio), IRQ_TYPE_LEVEL_LOW); else - set_irq_type(gpio_to_irq(pdata->id_gpio), IRQ_TYPE_LEVEL_HIGH); + irq_set_irq_type(gpio_to_irq(pdata->id_gpio), IRQ_TYPE_LEVEL_HIGH); if (value == f_otg->fsm.id) @@ -1082,10 +1081,10 @@ int usb_otg_start(struct platform_device *pdev) if (pdata->id_gpio != 0) { p_otg->fsm.id = gpio_get_value(pdata->id_gpio) ? 1 : 0; if (p_otg->fsm.id) - set_irq_type(gpio_to_irq(pdata->id_gpio), + irq_set_irq_type(gpio_to_irq(pdata->id_gpio), IRQ_TYPE_LEVEL_LOW); else - set_irq_type(gpio_to_irq(pdata->id_gpio), + irq_set_irq_type(gpio_to_irq(pdata->id_gpio), IRQ_TYPE_LEVEL_HIGH); } p_otg->otg.state = p_otg->fsm.id ? OTG_STATE_UNDEFINED : |