diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-23 00:19:18 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:34 -0800 |
commit | 6b8121f30d001e2cbae6ede6822f70c73dc3100a (patch) | |
tree | 32edee2c1d52b1d3390805fb1950537e84d07d2f | |
parent | c788a318f6d5e8ebf44286fedddad6c15c4a617c (diff) |
HACK merge fixups for compile
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
-rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 1 | ||||
-rw-r--r-- | arch/arm/vfp/vfpmodule.c | 8 | ||||
-rw-r--r-- | drivers/gpio/gpio-tegra.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 8 | ||||
-rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 6 | ||||
-rw-r--r-- | drivers/spi/spi-tegra.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/f_adb.c | 12 | ||||
-rw-r--r-- | drivers/usb/gadget/f_mtp.c | 14 | ||||
-rw-r--r-- | fs/proc/base.c | 7 | ||||
-rw-r--r-- | include/net/bluetooth/l2cap.h | 2 |
10 files changed, 28 insertions, 35 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index bc598d048969..ad9c43b0ae9a 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -27,6 +27,7 @@ #include <linux/io.h> #include <linux/gpio.h> #include <linux/i2c.h> +#include <linux/i2c-tegra.h> #include <linux/memblock.h> #include <sound/wm8903.h> diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 8383b7a1e90a..e381dc68505d 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -184,11 +184,11 @@ static int vfp_cpu_pm_notifier(struct notifier_block *self, unsigned long cmd, switch (cmd) { case CPU_PM_ENTER: - if (last_VFP_context[cpu]) { + if (vfp_current_hw_state[cpu]) { fmxr(FPEXC, fpexc | FPEXC_EN); - vfp_save_state(last_VFP_context[cpu], fpexc); + vfp_save_state(vfp_current_hw_state[cpu], fpexc); /* force a reload when coming back from idle */ - last_VFP_context[cpu] = NULL; + vfp_current_hw_state[cpu] = NULL; fmxr(FPEXC, fpexc & ~FPEXC_EN); } break; @@ -442,7 +442,7 @@ static int vfp_pm_suspend(void) u32 fpexc = fmrx(FPEXC); /* If lazy disable, re-enable the VFP ready for it to be saved */ - if (last_VFP_context[ti->cpu] != &ti->vfpstate) { + if (vfp_current_hw_state[ti->cpu] != &ti->vfpstate) { fpexc |= FPEXC_EN; fmxr(FPEXC, fpexc); } diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index 94da36eadcf9..d1ad4d415a19 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -32,9 +32,10 @@ #include <asm/mach/irq.h> #include <mach/iomap.h> -#include "pm-irq.h" #include <mach/pinmux.h> +#include "../../../arch/arm/mach-tegra/pm-irq.h" + #define GPIO_BANK(x) ((x) >> 5) #define GPIO_PORT(x) (((x) >> 3) & 0x3) #define GPIO_BIT(x) ((x) & 0x7) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 15ad0be8df06..2cbee05c3897 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -829,8 +829,8 @@ static int tegra_i2c_probe(struct platform_device *pdev) i2c_dev->is_clkon_always = plat->is_clkon_always; i2c_dev->last_bus_clk_rate = 100000; /* default clock rate */ - if (pdata) { - i2c_dev->last_bus_clk_rate = pdata->bus_clk_rate[0]; + if (plat) { + i2c_dev->last_bus_clk_rate = plat->bus_clk_rate[0]; } else if (i2c_dev->dev->of_node) { /* if there is a device tree node ... */ /* TODO: DAN: this doesn't work for DT */ @@ -906,11 +906,11 @@ static int tegra_i2c_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Failed to add I2C adapter\n"); goto err_del_bus; } + of_i2c_register_devices(&i2c_bus->adapter); + i2c_dev->bus_count++; } - of_i2c_register_devices(&i2c_dev->adapter); - return 0; err_del_bus: diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index e624b9034f54..777ea7807a3f 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -503,7 +503,8 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev) tegra_host = kzalloc(sizeof(struct tegra_sdhci_host), GFP_KERNEL); if (tegra_host == NULL) { dev_err(mmc_dev(host->mmc), "failed to allocate tegra host\n"); - return -ENOMEM; + rc = -ENOMEM; + goto err_no_mem; } #ifdef CONFIG_MMC_EMBEDDED_SDIO @@ -680,9 +681,10 @@ err_cd_req: gpio_free(plat->power_gpio); } err_power_req: +err_no_mem: + kfree(tegra_host); err_no_plat: sdhci_pltfm_free(pdev); - kfree(tegra_host); return rc; } diff --git a/drivers/spi/spi-tegra.c b/drivers/spi/spi-tegra.c index 6afca0ec7ab5..e1741cd20295 100644 --- a/drivers/spi/spi-tegra.c +++ b/drivers/spi/spi-tegra.c @@ -1470,7 +1470,7 @@ static int spi_tegra_suspend(struct platform_device *pdev, pm_message_t state) dev_err(&pdev->dev, "Spi transfer is in progress " "Avoiding suspend\n"); tspi->is_suspended = false; - spi_unlock_irqrestore(&tspi->lock, flags); + spin_unlock_irqrestore(&tspi->lock, flags); return -EBUSY; } diff --git a/drivers/usb/gadget/f_adb.c b/drivers/usb/gadget/f_adb.c index d185b2cfc00d..94a793f43901 100644 --- a/drivers/usb/gadget/f_adb.c +++ b/drivers/usb/gadget/f_adb.c @@ -540,16 +540,12 @@ static int adb_function_set_alt(struct usb_function *f, int ret; DBG(cdev, "adb_function_set_alt intf: %d alt: %d\n", intf, alt); - ret = usb_ep_enable(dev->ep_in, - ep_choose(cdev->gadget, - &adb_highspeed_in_desc, - &adb_fullspeed_in_desc)); + config_ep_by_speed(cdev->gadget, f, dev->ep_in); + ret = usb_ep_enable(dev->ep_in); if (ret) return ret; - ret = usb_ep_enable(dev->ep_out, - ep_choose(cdev->gadget, - &adb_highspeed_out_desc, - &adb_fullspeed_out_desc)); + config_ep_by_speed(cdev->gadget, f, dev->ep_out); + ret = usb_ep_enable(dev->ep_out); if (ret) { usb_ep_disable(dev->ep_in); return ret; diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c index 2829231327d4..143086ae585d 100644 --- a/drivers/usb/gadget/f_mtp.c +++ b/drivers/usb/gadget/f_mtp.c @@ -1132,21 +1132,17 @@ static int mtp_function_set_alt(struct usb_function *f, int ret; DBG(cdev, "mtp_function_set_alt intf: %d alt: %d\n", intf, alt); - ret = usb_ep_enable(dev->ep_in, - ep_choose(cdev->gadget, - &mtp_highspeed_in_desc, - &mtp_fullspeed_in_desc)); + config_ep_by_speed(cdev->gadget, f, dev->ep_in); + ret = usb_ep_enable(dev->ep_in); if (ret) return ret; - ret = usb_ep_enable(dev->ep_out, - ep_choose(cdev->gadget, - &mtp_highspeed_out_desc, - &mtp_fullspeed_out_desc)); + config_ep_by_speed(cdev->gadget, f, dev->ep_out); + ret = usb_ep_enable(dev->ep_out); if (ret) { usb_ep_disable(dev->ep_in); return ret; } - ret = usb_ep_enable(dev->ep_intr, &mtp_intr_desc); + ret = usb_ep_enable(dev->ep_intr); if (ret) { usb_ep_disable(dev->ep_out); usb_ep_disable(dev->ep_in); diff --git a/fs/proc/base.c b/fs/proc/base.c index 86ea28bcec5a..445777158609 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1147,13 +1147,12 @@ out: return err < 0 ? err : count; } -static int oom_adjust_permission(struct inode *inode, int mask, - unsigned int flags) +static int oom_adjust_permission(struct inode *inode, int mask) { uid_t uid; struct task_struct *p; - if (flags & IPERM_FLAG_RCU) + if (mask & MAY_NOT_BLOCK) return -ECHILD; p = get_proc_task(inode); @@ -1173,7 +1172,7 @@ static int oom_adjust_permission(struct inode *inode, int mask, } /* Fall back to default. */ - return generic_permission(inode, mask, flags, NULL); + return generic_permission(inode, mask); } static const struct inode_operations proc_oom_adjust_inode_operations = { diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 7493317a91d9..4f34ad25e75c 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -418,8 +418,6 @@ struct l2cap_conn { struct timer_list security_timer; - struct timer_list security_timer; - struct list_head chan_l; rwlock_t chan_lock; }; |