Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung
* 'samsung-fixes-3' of git://github.com/kgene/linux-samsung:
ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver
ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt
ARM: S3C2443: Fix bit-reset in setrate of clk_armdiv
+10
-13
+2
-4
arch/arm/mach-exynos4/clock.c
+2
-4
arch/arm/mach-exynos4/clock.c
···
899
899
.reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 28, .size = 4 },
900
900
}, {
901
901
.clk = {
902
-
.name = "sclk_cam",
903
-
.devname = "exynos4-fimc.0",
902
+
.name = "sclk_cam0",
904
903
.enable = exynos4_clksrc_mask_cam_ctrl,
905
904
.ctrlbit = (1 << 16),
906
905
},
···
908
909
.reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 16, .size = 4 },
909
910
}, {
910
911
.clk = {
911
-
.name = "sclk_cam",
912
-
.devname = "exynos4-fimc.1",
912
+
.name = "sclk_cam1",
913
913
.enable = exynos4_clksrc_mask_cam_ctrl,
914
914
.ctrlbit = (1 << 20),
915
915
},
+1
-1
arch/arm/mach-s3c2443/clock.c
+1
-1
arch/arm/mach-s3c2443/clock.c
+2
-4
arch/arm/mach-s5pv210/clock.c
+2
-4
arch/arm/mach-s5pv210/clock.c
···
815
815
.reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },
816
816
}, {
817
817
.clk = {
818
-
.name = "sclk_cam",
819
-
.devname = "s5pv210-fimc.0",
818
+
.name = "sclk_cam0",
820
819
.enable = s5pv210_clk_mask0_ctrl,
821
820
.ctrlbit = (1 << 3),
822
821
},
···
824
825
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 },
825
826
}, {
826
827
.clk = {
827
-
.name = "sclk_cam",
828
-
.devname = "s5pv210-fimc.1",
828
+
.name = "sclk_cam1",
829
829
.enable = s5pv210_clk_mask0_ctrl,
830
830
.ctrlbit = (1 << 4),
831
831
},
+5
-4
arch/arm/plat-s5p/irq-gpioint.c
+5
-4
arch/arm/plat-s5p/irq-gpioint.c
···
114
114
{
115
115
static int used_gpioint_groups = 0;
116
116
int group = chip->group;
117
-
struct s5p_gpioint_bank *bank = NULL;
117
+
struct s5p_gpioint_bank *b, *bank = NULL;
118
118
struct irq_chip_generic *gc;
119
119
struct irq_chip_type *ct;
120
120
121
121
if (used_gpioint_groups >= S5P_GPIOINT_GROUP_COUNT)
122
122
return -ENOMEM;
123
123
124
-
list_for_each_entry(bank, &banks, list) {
125
-
if (group >= bank->start &&
126
-
group < bank->start + bank->nr_groups)
124
+
list_for_each_entry(b, &banks, list) {
125
+
if (group >= b->start && group < b->start + b->nr_groups) {
126
+
bank = b;
127
127
break;
128
+
}
128
129
}
129
130
if (!bank)
130
131
return -EINVAL;