ar71xx: improve 2.6.36 compatibility. also, instead of adding a forward port patch...
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-2.6.32 / 990-backport.patch
1 --- a/drivers/net/ag71xx/ag71xx_main.c
2 +++ b/drivers/net/ag71xx/ag71xx_main.c
3 @@ -685,6 +685,7 @@ static netdev_tx_t ag71xx_hard_start_xmi
4
5 static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
6 {
7 + struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data;
8 struct ag71xx *ag = netdev_priv(dev);
9 int ret;
10
11 @@ -716,7 +717,7 @@ static int ag71xx_do_ioctl(struct net_de
12 if (ag->phy_dev == NULL)
13 break;
14
15 - return phy_mii_ioctl(ag->phy_dev, ifr, cmd);
16 + return phy_mii_ioctl(ag->phy_dev, data, cmd);
17
18 default:
19 break;
20 --- a/drivers/spi/ap83_spi.c
21 +++ b/drivers/spi/ap83_spi.c
22 @@ -127,34 +127,33 @@ static void ap83_spi_chipselect(struct s
23
24 #define EXPAND_BITBANG_TXRX
25 #include <linux/spi/spi_bitbang.h>
26 -#include "spi_bitbang_txrx.h"
27
28 static u32 ap83_spi_txrx_mode0(struct spi_device *spi,
29 unsigned nsecs, u32 word, u8 bits)
30 {
31 dev_dbg(&spi->dev, "TXRX0 word=%08x, bits=%u\n", word, bits);
32 - return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
33 + return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
34 }
35
36 static u32 ap83_spi_txrx_mode1(struct spi_device *spi,
37 unsigned nsecs, u32 word, u8 bits)
38 {
39 dev_dbg(&spi->dev, "TXRX1 word=%08x, bits=%u\n", word, bits);
40 - return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
41 + return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
42 }
43
44 static u32 ap83_spi_txrx_mode2(struct spi_device *spi,
45 unsigned nsecs, u32 word, u8 bits)
46 {
47 dev_dbg(&spi->dev, "TXRX2 word=%08x, bits=%u\n", word, bits);
48 - return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
49 + return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
50 }
51
52 static u32 ap83_spi_txrx_mode3(struct spi_device *spi,
53 unsigned nsecs, u32 word, u8 bits)
54 {
55 dev_dbg(&spi->dev, "TXRX3 word=%08x, bits=%u\n", word, bits);
56 - return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
57 + return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
58 }
59
60 static int ap83_spi_probe(struct platform_device *pdev)
61 --- a/drivers/watchdog/ar71xx_wdt.c
62 +++ b/drivers/watchdog/ar71xx_wdt.c
63 @@ -146,7 +146,7 @@ static struct watchdog_info ar71xx_wdt_i
64 .identity = "AR71XX watchdog",
65 };
66
67 -static long ar71xx_wdt_ioctl(struct file *file,
68 +static int ar71xx_wdt_ioctl(struct inode *inode, struct file *file,
69 unsigned int cmd, unsigned long arg)
70 {
71 int t;
72 @@ -197,7 +197,7 @@ static long ar71xx_wdt_ioctl(struct file
73 static const struct file_operations ar71xx_wdt_fops = {
74 .owner = THIS_MODULE,
75 .write = ar71xx_wdt_write,
76 - .unlocked_ioctl = ar71xx_wdt_ioctl,
77 + .ioctl = ar71xx_wdt_ioctl,
78 .open = ar71xx_wdt_open,
79 .release = ar71xx_wdt_release,
80 };