diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 16:56:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 16:56:39 -0400 |
commit | d3ec4844d449cf7af9e749f73ba2052fb7b72fc2 (patch) | |
tree | c515913e85f7e50878c83da2a88bc5a7269d087c /arch/arm | |
parent | 0003230e8200699860f0b10af524dc47bf8aecad (diff) | |
parent | df2e301fee3c2c2a87592151397ad7699bb14c37 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
fs: Merge split strings
treewide: fix potentially dangerous trailing ';' in #defined values/expressions
uwb: Fix misspelling of neighbourhood in comment
net, netfilter: Remove redundant goto in ebt_ulog_packet
trivial: don't touch files that are removed in the staging tree
lib/vsprintf: replace link to Draft by final RFC number
doc: Kconfig: `to be' -> `be'
doc: Kconfig: Typo: square -> squared
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
drivers/net: static should be at beginning of declaration
drivers/media: static should be at beginning of declaration
drivers/i2c: static should be at beginning of declaration
XTENSA: static should be at beginning of declaration
SH: static should be at beginning of declaration
MIPS: static should be at beginning of declaration
ARM: static should be at beginning of declaration
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Update my e-mail address
PCIe ASPM: forcedly -> forcibly
gma500: push through device driver tree
...
Fix up trivial conflicts:
- arch/arm/mach-ep93xx/dma-m2p.c (deleted)
- drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
- drivers/net/r8169.c (just context changes)
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/common/scoop.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-snapper9260.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-dove/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/simone.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/pcie.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/corgi.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa27x-udc.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/h1940-bluetooth.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-u300/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s5p/sysmmu.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-samsung/pm-check.c | 2 |
15 files changed, 21 insertions, 24 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index c11af1e4bad3..a07b0e763a80 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c | |||
@@ -193,7 +193,7 @@ static int __devinit scoop_probe(struct platform_device *pdev) | |||
193 | spin_lock_init(&devptr->scoop_lock); | 193 | spin_lock_init(&devptr->scoop_lock); |
194 | 194 | ||
195 | inf = pdev->dev.platform_data; | 195 | inf = pdev->dev.platform_data; |
196 | devptr->base = ioremap(mem->start, mem->end - mem->start + 1); | 196 | devptr->base = ioremap(mem->start, resource_size(mem)); |
197 | 197 | ||
198 | if (!devptr->base) { | 198 | if (!devptr->base) { |
199 | ret = -ENOMEM; | 199 | ret = -ENOMEM; |
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 5004bf0a05f2..0f917928eeb7 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c | |||
@@ -525,7 +525,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
525 | if (ARRAY_SIZE(lcdc_resources) > 2) { | 525 | if (ARRAY_SIZE(lcdc_resources) > 2) { |
526 | void __iomem *fb; | 526 | void __iomem *fb; |
527 | struct resource *fb_res = &lcdc_resources[2]; | 527 | struct resource *fb_res = &lcdc_resources[2]; |
528 | size_t fb_len = fb_res->end - fb_res->start + 1; | 528 | size_t fb_len = resource_size(fb_res); |
529 | 529 | ||
530 | fb = ioremap(fb_res->start, fb_len); | 530 | fb = ioremap(fb_res->start, fb_len); |
531 | if (fb) { | 531 | if (fb) { |
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c index 3eb0a1153cc8..6010ce16b3cf 100644 --- a/arch/arm/mach-at91/board-snapper9260.c +++ b/arch/arm/mach-at91/board-snapper9260.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Copyright (C) 2010 Bluewater System Ltd | 4 | * Copyright (C) 2010 Bluewater System Ltd |
5 | * | 5 | * |
6 | * Author: Andre Renaud <andre@bluewatersys.com> | 6 | * Author: Andre Renaud <andre@bluewatersys.com> |
7 | * Author: Ryan Mallon <ryan@bluewatersys.com> | 7 | * Author: Ryan Mallon |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 5ed51b84c1b2..83dce859886d 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c | |||
@@ -13,11 +13,9 @@ | |||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
15 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
16 | #include <linux/serial_8250.h> | ||
17 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
18 | #include <linux/mbus.h> | 17 | #include <linux/mbus.h> |
19 | #include <linux/ata_platform.h> | 18 | #include <linux/ata_platform.h> |
20 | #include <linux/serial_8250.h> | ||
21 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
22 | #include <asm/page.h> | 20 | #include <asm/page.h> |
23 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index d96dc1c5da20..8392e95d7cea 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * arch/arm/mach-ep93xx/simone.c | 2 | * arch/arm/mach-ep93xx/simone.c |
3 | * Simplemachines Sim.One support. | 3 | * Simplemachines Sim.One support. |
4 | * | 4 | * |
5 | * Copyright (C) 2010 Ryan Mallon <ryan@bluewatersys.com> | 5 | * Copyright (C) 2010 Ryan Mallon |
6 | * | 6 | * |
7 | * Based on the 2.6.24.7 support: | 7 | * Based on the 2.6.24.7 support: |
8 | * Copyright (C) 2009 Simplemachines | 8 | * Copyright (C) 2009 Simplemachines |
@@ -65,7 +65,7 @@ static void __init simone_init_machine(void) | |||
65 | } | 65 | } |
66 | 66 | ||
67 | MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") | 67 | MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") |
68 | /* Maintainer: Ryan Mallon <ryan@bluewatersys.com> */ | 68 | /* Maintainer: Ryan Mallon */ |
69 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | 69 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, |
70 | .map_io = ep93xx_map_io, | 70 | .map_io = ep93xx_map_io, |
71 | .init_irq = ep93xx_init_irq, | 71 | .init_irq = ep93xx_init_irq, |
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index ac601fe2b448..2e9c614757e4 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Bluewater Systems Snapper CL15 system module | 3 | * Bluewater Systems Snapper CL15 system module |
4 | * | 4 | * |
5 | * Copyright (C) 2009 Bluewater Systems Ltd | 5 | * Copyright (C) 2009 Bluewater Systems Ltd |
6 | * Author: Ryan Mallon <ryan@bluewatersys.com> | 6 | * Author: Ryan Mallon |
7 | * | 7 | * |
8 | * NAND code adapted from driver by: | 8 | * NAND code adapted from driver by: |
9 | * Andre Renaud <andre@bluewatersys.com> | 9 | * Andre Renaud <andre@bluewatersys.com> |
@@ -162,7 +162,7 @@ static void __init snappercl15_init_machine(void) | |||
162 | } | 162 | } |
163 | 163 | ||
164 | MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") | 164 | MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") |
165 | /* Maintainer: Ryan Mallon <ryan@bluewatersys.com> */ | 165 | /* Maintainer: Ryan Mallon */ |
166 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | 166 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, |
167 | .map_io = ep93xx_map_io, | 167 | .map_io = ep93xx_map_io, |
168 | .init_irq = ep93xx_init_irq, | 168 | .init_irq = ep93xx_init_irq, |
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index a560439dcc3c..f27c7d2fa9f7 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c | |||
@@ -129,12 +129,12 @@ static void __init mv78xx0_pcie_preinit(void) | |||
129 | struct pcie_port *pp = pcie_port + i; | 129 | struct pcie_port *pp = pcie_port + i; |
130 | 130 | ||
131 | mv78xx0_setup_pcie_io_win(win++, pp->res[0].start, | 131 | mv78xx0_setup_pcie_io_win(win++, pp->res[0].start, |
132 | pp->res[0].end - pp->res[0].start + 1, | 132 | resource_size(&pp->res[0]), |
133 | pp->maj, pp->min); | 133 | pp->maj, pp->min); |
134 | 134 | ||
135 | mv78xx0_setup_pcie_mem_win(win++, pp->res[1].start, | 135 | mv78xx0_setup_pcie_mem_win(win++, pp->res[1].start, |
136 | pp->res[1].end - pp->res[1].start + 1, | 136 | resource_size(&pp->res[1]), |
137 | pp->maj, pp->min); | 137 | pp->maj, pp->min); |
138 | } | 138 | } |
139 | } | 139 | } |
140 | 140 | ||
diff --git a/arch/arm/mach-pxa/include/mach/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h index 0011055bc3f9..5dfd1195a5a7 100644 --- a/arch/arm/mach-pxa/include/mach/corgi.h +++ b/arch/arm/mach-pxa/include/mach/corgi.h | |||
@@ -34,7 +34,7 @@ | |||
34 | #define CORGI_GPIO_LCDCON_CS (19) /* LCD Control Chip Select */ | 34 | #define CORGI_GPIO_LCDCON_CS (19) /* LCD Control Chip Select */ |
35 | #define CORGI_GPIO_MAX1111_CS (20) /* MAX1111 Chip Select */ | 35 | #define CORGI_GPIO_MAX1111_CS (20) /* MAX1111 Chip Select */ |
36 | #define CORGI_GPIO_ADC_TEMP_ON (21) /* Select battery voltage or temperature */ | 36 | #define CORGI_GPIO_ADC_TEMP_ON (21) /* Select battery voltage or temperature */ |
37 | #define CORGI_GPIO_IR_ON (22) /* Enable IR Transciever */ | 37 | #define CORGI_GPIO_IR_ON (22) /* Enable IR Transceiver */ |
38 | #define CORGI_GPIO_ADS7846_CS (24) /* ADS7846 Chip Select */ | 38 | #define CORGI_GPIO_ADS7846_CS (24) /* ADS7846 Chip Select */ |
39 | #define CORGI_GPIO_SD_PWR (33) /* MMC/SD Power */ | 39 | #define CORGI_GPIO_SD_PWR (33) /* MMC/SD Power */ |
40 | #define CORGI_GPIO_CHRG_ON (38) /* Enable battery Charging */ | 40 | #define CORGI_GPIO_CHRG_ON (38) /* Enable battery Charging */ |
diff --git a/arch/arm/mach-pxa/include/mach/pxa27x-udc.h b/arch/arm/mach-pxa/include/mach/pxa27x-udc.h index ab1443f8bd89..4cf28f670706 100644 --- a/arch/arm/mach-pxa/include/mach/pxa27x-udc.h +++ b/arch/arm/mach-pxa/include/mach/pxa27x-udc.h | |||
@@ -56,9 +56,9 @@ | |||
56 | #define UDCFNR __REG(0x40600014) /* UDC Frame Number Register */ | 56 | #define UDCFNR __REG(0x40600014) /* UDC Frame Number Register */ |
57 | #define UDCOTGICR __REG(0x40600018) /* UDC On-The-Go interrupt control */ | 57 | #define UDCOTGICR __REG(0x40600018) /* UDC On-The-Go interrupt control */ |
58 | #define UDCOTGICR_IESF (1 << 24) /* OTG SET_FEATURE command recvd */ | 58 | #define UDCOTGICR_IESF (1 << 24) /* OTG SET_FEATURE command recvd */ |
59 | #define UDCOTGICR_IEXR (1 << 17) /* Extra Transciever Interrupt | 59 | #define UDCOTGICR_IEXR (1 << 17) /* Extra Transceiver Interrupt |
60 | Rising Edge Interrupt Enable */ | 60 | Rising Edge Interrupt Enable */ |
61 | #define UDCOTGICR_IEXF (1 << 16) /* Extra Transciever Interrupt | 61 | #define UDCOTGICR_IEXF (1 << 16) /* Extra Transceiver Interrupt |
62 | Falling Edge Interrupt Enable */ | 62 | Falling Edge Interrupt Enable */ |
63 | #define UDCOTGICR_IEVV40R (1 << 9) /* OTG Vbus Valid 4.0V Rising Edge | 63 | #define UDCOTGICR_IEVV40R (1 << 9) /* OTG Vbus Valid 4.0V Rising Edge |
64 | Interrupt Enable */ | 64 | Interrupt Enable */ |
diff --git a/arch/arm/mach-s3c2410/h1940-bluetooth.c b/arch/arm/mach-s3c2410/h1940-bluetooth.c index 2c126bbca08d..a5eeb62ce1c2 100644 --- a/arch/arm/mach-s3c2410/h1940-bluetooth.c +++ b/arch/arm/mach-s3c2410/h1940-bluetooth.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/leds.h> | 18 | #include <linux/leds.h> |
19 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
20 | #include <linux/rfkill.h> | 20 | #include <linux/rfkill.h> |
21 | #include <linux/leds.h> | ||
22 | 21 | ||
23 | #include <mach/regs-gpio.h> | 22 | #include <mach/regs-gpio.h> |
24 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index b473b8efac68..837138e369bc 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c | |||
@@ -443,7 +443,7 @@ static struct platform_device usb1_host_device = { | |||
443 | .resource = usb1_host_resources, | 443 | .resource = usb1_host_resources, |
444 | }; | 444 | }; |
445 | 445 | ||
446 | const static struct fb_videomode ap4evb_lcdc_modes[] = { | 446 | static const struct fb_videomode ap4evb_lcdc_modes[] = { |
447 | { | 447 | { |
448 | #ifdef CONFIG_AP4EVB_QHD | 448 | #ifdef CONFIG_AP4EVB_QHD |
449 | .name = "R63302(QHD)", | 449 | .name = "R63302(QHD)", |
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 513d6abec1f5..399c89f14dfb 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c | |||
@@ -1791,7 +1791,7 @@ static void __init u300_assign_physmem(void) | |||
1791 | 0 == res->start) { | 1791 | 0 == res->start) { |
1792 | res->start = curr_start; | 1792 | res->start = curr_start; |
1793 | res->end += curr_start; | 1793 | res->end += curr_start; |
1794 | curr_start += (res->end - res->start + 1); | 1794 | curr_start += resource_size(res); |
1795 | 1795 | ||
1796 | printk(KERN_INFO "core.c: Mapping RAM " \ | 1796 | printk(KERN_INFO "core.c: Mapping RAM " \ |
1797 | "%#x-%#x to device %s:%s\n", | 1797 | "%#x-%#x to device %s:%s\n", |
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 9ed0f90cfe23..0f2e522f387d 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c | |||
@@ -77,7 +77,7 @@ static struct regulator_consumer_supply ab8500_vtvout_consumers[] = { | |||
77 | static struct regulator_consumer_supply ab8500_vintcore_consumers[] = { | 77 | static struct regulator_consumer_supply ab8500_vintcore_consumers[] = { |
78 | /* SoC core supply, no device */ | 78 | /* SoC core supply, no device */ |
79 | REGULATOR_SUPPLY("v-intcore", NULL), | 79 | REGULATOR_SUPPLY("v-intcore", NULL), |
80 | /* USB Transciever */ | 80 | /* USB Transceiver */ |
81 | REGULATOR_SUPPLY("vddulpivio18", "ab8500-usb.0"), | 81 | REGULATOR_SUPPLY("vddulpivio18", "ab8500-usb.0"), |
82 | }; | 82 | }; |
83 | 83 | ||
diff --git a/arch/arm/plat-s5p/sysmmu.c b/arch/arm/plat-s5p/sysmmu.c index 54f5eddc921d..e1cbc728c775 100644 --- a/arch/arm/plat-s5p/sysmmu.c +++ b/arch/arm/plat-s5p/sysmmu.c | |||
@@ -232,8 +232,8 @@ static int s5p_sysmmu_probe(struct platform_device *pdev) | |||
232 | goto err_res; | 232 | goto err_res; |
233 | } | 233 | } |
234 | 234 | ||
235 | mem = request_mem_region(res->start, | 235 | mem = request_mem_region(res->start, resource_size(res), |
236 | ((res->end) - (res->start)) + 1, pdev->name); | 236 | pdev->name); |
237 | if (!mem) { | 237 | if (!mem) { |
238 | dev_err(dev, "Failed to request the memory region of %s.\n", | 238 | dev_err(dev, "Failed to request the memory region of %s.\n", |
239 | sysmmu_ips_name[i]); | 239 | sysmmu_ips_name[i]); |
@@ -241,7 +241,7 @@ static int s5p_sysmmu_probe(struct platform_device *pdev) | |||
241 | goto err_res; | 241 | goto err_res; |
242 | } | 242 | } |
243 | 243 | ||
244 | sysmmusfrs[i] = ioremap(res->start, res->end - res->start + 1); | 244 | sysmmusfrs[i] = ioremap(res->start, resource_size(res)); |
245 | if (!sysmmusfrs[i]) { | 245 | if (!sysmmusfrs[i]) { |
246 | dev_err(dev, "Failed to ioremap() for %s.\n", | 246 | dev_err(dev, "Failed to ioremap() for %s.\n", |
247 | sysmmu_ips_name[i]); | 247 | sysmmu_ips_name[i]); |
diff --git a/arch/arm/plat-samsung/pm-check.c b/arch/arm/plat-samsung/pm-check.c index 6b733fafe7cd..3cbd62666b1e 100644 --- a/arch/arm/plat-samsung/pm-check.c +++ b/arch/arm/plat-samsung/pm-check.c | |||
@@ -72,7 +72,7 @@ static void s3c_pm_run_sysram(run_fn_t fn, u32 *arg) | |||
72 | 72 | ||
73 | static u32 *s3c_pm_countram(struct resource *res, u32 *val) | 73 | static u32 *s3c_pm_countram(struct resource *res, u32 *val) |
74 | { | 74 | { |
75 | u32 size = (u32)(res->end - res->start)+1; | 75 | u32 size = (u32)resource_size(res); |
76 | 76 | ||
77 | size += CHECK_CHUNKSIZE-1; | 77 | size += CHECK_CHUNKSIZE-1; |
78 | size /= CHECK_CHUNKSIZE; | 78 | size /= CHECK_CHUNKSIZE; |