diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-26 16:18:19 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-26 16:18:19 -0400 |
commit | a0212796b58061a9716178d261f318925c246643 (patch) | |
tree | e107fbd74e98b301bfb8c964443c6c86a0f609a3 | |
parent | 2da8a79f7d81853d00b6a00621aeef7545196084 (diff) | |
parent | 97af08b6e10e06563309728ed2fe8fdd919c5a33 (diff) |
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers
Several fixes for build failures and sparse warnings in the
OMAP cleanup-headers branch. Intended for 3.8 cleanup.
Basic build, boot, and PM test logs are available from here:
http://www.pwsan.com/omap/testlogs/cleanup-headers-compile-fixes-3.8/20121026132711/
Due to underlying problems in v3.7-rc2, several tests fail. These
failures are unrelated to these patches.
-rw-r--r-- | arch/arm/mach-omap1/fpga.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/pm_bus.c | 2 | ||||
-rw-r--r-- | drivers/mtd/onenand/omap2.c | 36 |
3 files changed, 27 insertions, 12 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 4ec220d8da5c..d940fac9a9ed 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
33 | 33 | ||
34 | #include "iomap.h" | 34 | #include "iomap.h" |
35 | #include "common.h" | ||
35 | 36 | ||
36 | static void fpga_mask_irq(struct irq_data *d) | 37 | static void fpga_mask_irq(struct irq_data *d) |
37 | { | 38 | { |
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c index 16bf2f95117c..3f2d39672393 100644 --- a/arch/arm/mach-omap1/pm_bus.c +++ b/arch/arm/mach-omap1/pm_bus.c | |||
@@ -19,6 +19,8 @@ | |||
19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
21 | 21 | ||
22 | #include "soc.h" | ||
23 | |||
22 | #ifdef CONFIG_PM_RUNTIME | 24 | #ifdef CONFIG_PM_RUNTIME |
23 | static int omap1_pm_runtime_suspend(struct device *dev) | 25 | static int omap1_pm_runtime_suspend(struct device *dev) |
24 | { | 26 | { |
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 53069aef1f48..99f96e19ebea 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c | |||
@@ -445,13 +445,19 @@ out_copy: | |||
445 | 445 | ||
446 | #else | 446 | #else |
447 | 447 | ||
448 | int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area, | 448 | static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area, |
449 | unsigned char *buffer, int offset, | 449 | unsigned char *buffer, int offset, |
450 | size_t count); | 450 | size_t count) |
451 | { | ||
452 | return -ENOSYS; | ||
453 | } | ||
451 | 454 | ||
452 | int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area, | 455 | static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area, |
453 | const unsigned char *buffer, | 456 | const unsigned char *buffer, |
454 | int offset, size_t count); | 457 | int offset, size_t count) |
458 | { | ||
459 | return -ENOSYS; | ||
460 | } | ||
455 | 461 | ||
456 | #endif | 462 | #endif |
457 | 463 | ||
@@ -549,13 +555,19 @@ static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area, | |||
549 | 555 | ||
550 | #else | 556 | #else |
551 | 557 | ||
552 | int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area, | 558 | static int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area, |
553 | unsigned char *buffer, int offset, | 559 | unsigned char *buffer, int offset, |
554 | size_t count); | 560 | size_t count) |
561 | { | ||
562 | return -ENOSYS; | ||
563 | } | ||
555 | 564 | ||
556 | int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area, | 565 | static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area, |
557 | const unsigned char *buffer, | 566 | const unsigned char *buffer, |
558 | int offset, size_t count); | 567 | int offset, size_t count) |
568 | { | ||
569 | return -ENOSYS; | ||
570 | } | ||
559 | 571 | ||
560 | #endif | 572 | #endif |
561 | 573 | ||