From 8625cc625edff73092ae4c23503c71facdf6c9dc Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sun, 18 Sep 2011 21:02:55 -0400 Subject: [PATCH] --- yaml --- r: 263961 b: refs/heads/master c: e05c82d3666119075615fdbf6abca0266344f27b h: refs/heads/master i: 263959: 6d20407096fc907b9561002686df112cc31e1378 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/max8997.c | 5 ----- trunk/drivers/mfd/omap-usb-host.c | 2 +- trunk/drivers/mfd/tps65910-irq.c | 2 -- trunk/drivers/mfd/twl4030-madc.c | 5 +---- trunk/drivers/mfd/wm8350-gpio.c | 4 ++-- trunk/include/linux/mfd/wm8994/pdata.h | 2 +- trunk/include/net/tcp.h | 19 ++++++++++++++++++- 8 files changed, 24 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 57479d66f95e..4a96e3c24081 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bf3b0dc32a27c6e1ba3dcdaf428a043113cd389 +refs/heads/master: e05c82d3666119075615fdbf6abca0266344f27b diff --git a/trunk/drivers/mfd/max8997.c b/trunk/drivers/mfd/max8997.c index f83103b8970d..5d1fca0277ef 100644 --- a/trunk/drivers/mfd/max8997.c +++ b/trunk/drivers/mfd/max8997.c @@ -135,13 +135,10 @@ static int max8997_i2c_probe(struct i2c_client *i2c, max8997->dev = &i2c->dev; max8997->i2c = i2c; max8997->type = id->driver_data; - max8997->irq = i2c->irq; if (!pdata) goto err; - max8997->irq_base = pdata->irq_base; - max8997->ono = pdata->ono; max8997->wakeup = pdata->wakeup; mutex_init(&max8997->iolock); @@ -155,8 +152,6 @@ static int max8997_i2c_probe(struct i2c_client *i2c, pm_runtime_set_active(max8997->dev); - max8997_irq_init(max8997); - mfd_add_devices(max8997->dev, -1, max8997_devs, ARRAY_SIZE(max8997_devs), NULL, 0); diff --git a/trunk/drivers/mfd/omap-usb-host.c b/trunk/drivers/mfd/omap-usb-host.c index 86e14583a082..29601e7d606d 100644 --- a/trunk/drivers/mfd/omap-usb-host.c +++ b/trunk/drivers/mfd/omap-usb-host.c @@ -17,7 +17,6 @@ * along with this program. If not, see . */ #include -#include #include #include #include @@ -677,6 +676,7 @@ static void usbhs_omap_tll_init(struct device *dev, u8 tll_channel_count) | OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF | OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE); + reg |= (1 << (i + 1)); } else continue; diff --git a/trunk/drivers/mfd/tps65910-irq.c b/trunk/drivers/mfd/tps65910-irq.c index a56be931551c..2bfad5c86cc7 100644 --- a/trunk/drivers/mfd/tps65910-irq.c +++ b/trunk/drivers/mfd/tps65910-irq.c @@ -178,10 +178,8 @@ int tps65910_irq_init(struct tps65910 *tps65910, int irq, switch (tps65910_chip_id(tps65910)) { case TPS65910: tps65910->irq_num = TPS65910_NUM_IRQ; - break; case TPS65911: tps65910->irq_num = TPS65911_NUM_IRQ; - break; } /* Register with genirq */ diff --git a/trunk/drivers/mfd/twl4030-madc.c b/trunk/drivers/mfd/twl4030-madc.c index 7cbf2aa9e64f..b5d598c3aa71 100644 --- a/trunk/drivers/mfd/twl4030-madc.c +++ b/trunk/drivers/mfd/twl4030-madc.c @@ -510,9 +510,8 @@ int twl4030_madc_conversion(struct twl4030_madc_request *req) u8 ch_msb, ch_lsb; int ret; - if (!req || !twl4030_madc) + if (!req) return -EINVAL; - mutex_lock(&twl4030_madc->lock); if (req->method < TWL4030_MADC_RT || req->method > TWL4030_MADC_SW2) { ret = -EINVAL; @@ -707,8 +706,6 @@ static int __devinit twl4030_madc_probe(struct platform_device *pdev) if (!madc) return -ENOMEM; - madc->dev = &pdev->dev; - /* * Phoenix provides 2 interrupt lines. The first one is connected to * the OMAP. The other one can be connected to the other processor such diff --git a/trunk/drivers/mfd/wm8350-gpio.c b/trunk/drivers/mfd/wm8350-gpio.c index d584f6b4d6e2..ebf99bef392f 100644 --- a/trunk/drivers/mfd/wm8350-gpio.c +++ b/trunk/drivers/mfd/wm8350-gpio.c @@ -37,7 +37,7 @@ static int gpio_set_dir(struct wm8350 *wm8350, int gpio, int dir) return ret; } -static int wm8350_gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db) +static int gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db) { if (db == WM8350_GPIO_DEBOUNCE_ON) return wm8350_set_bits(wm8350, WM8350_GPIO_DEBOUNCE, @@ -210,7 +210,7 @@ int wm8350_gpio_config(struct wm8350 *wm8350, int gpio, int dir, int func, goto err; if (gpio_set_polarity(wm8350, gpio, pol)) goto err; - if (wm8350_gpio_set_debounce(wm8350, gpio, debounce)) + if (gpio_set_debounce(wm8350, gpio, debounce)) goto err; if (gpio_set_dir(wm8350, gpio, dir)) goto err; diff --git a/trunk/include/linux/mfd/wm8994/pdata.h b/trunk/include/linux/mfd/wm8994/pdata.h index 97cf4f27d647..d12f8d635a81 100644 --- a/trunk/include/linux/mfd/wm8994/pdata.h +++ b/trunk/include/linux/mfd/wm8994/pdata.h @@ -26,7 +26,7 @@ struct wm8994_ldo_pdata { struct regulator_init_data *init_data; }; -#define WM8994_CONFIGURE_GPIO 0x10000 +#define WM8994_CONFIGURE_GPIO 0x8000 #define WM8994_DRC_REGS 5 #define WM8994_EQ_REGS 20 diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h index e9b48b094683..acc620a4a45f 100644 --- a/trunk/include/net/tcp.h +++ b/trunk/include/net/tcp.h @@ -431,17 +431,34 @@ extern int tcp_disconnect(struct sock *sk, int flags); extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS]; extern struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, struct ip_options *opt); +#ifdef CONFIG_SYN_COOKIES extern __u32 cookie_v4_init_sequence(struct sock *sk, struct sk_buff *skb, __u16 *mss); +#else +static inline __u32 cookie_v4_init_sequence(struct sock *sk, + struct sk_buff *skb, + __u16 *mss) +{ + return 0; +} +#endif extern __u32 cookie_init_timestamp(struct request_sock *req); extern bool cookie_check_timestamp(struct tcp_options_received *opt, bool *); /* From net/ipv6/syncookies.c */ extern struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb); +#ifdef CONFIG_SYN_COOKIES extern __u32 cookie_v6_init_sequence(struct sock *sk, struct sk_buff *skb, __u16 *mss); - +#else +static inline __u32 cookie_v6_init_sequence(struct sock *sk, + struct sk_buff *skb, + __u16 *mss) +{ + return 0; +} +#endif /* tcp_output.c */ extern void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss,