kernel: handle bootargs-override the same everywhere

l is an int. No need for a cast. Also might as well use l since it's
available.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23892
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/ipq806x/patches-6.12/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-6.12/900-arm-add-cmdline-override.patch
index cd5c8c016da78a3daa4f2baec12c96bb7078e4cd..d9e964d018211681aa1ca364c77fffd22dfd3c4a 100644 (file)
--- a/target/linux/ipq806x/patches-6.12/900-arm-add-cmdline-override.patch
+++ b/target/linux/ipq806x/patches-6.12/900-arm-add-cmdline-override.patch
@@ -29,7 +29,7 @@
 +#ifdef CONFIG_CMDLINE_OVERRIDE
 +      p = of_get_flat_dt_prop(node, "bootargs-override", &l);
 +      if (p != NULL && l > 0)
-+              strscpy(cmdline, p, min((int)l, COMMAND_LINE_SIZE));
++              strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
 +#endif
 +
  handle_cmdline:

diff --git a/target/linux/mediatek/patches-6.18/901-arm-add-cmdline-override.patch b/target/linux/mediatek/patches-6.18/901-arm-add-cmdline-override.patch
index 505ba385dff93953f76f2d3eb324d02ac5953519..d1a4376bed0e2759794500d896610eeb96cf7d2e 100644 (file)
--- a/target/linux/mediatek/patches-6.18/901-arm-add-cmdline-override.patch
+++ b/target/linux/mediatek/patches-6.18/901-arm-add-cmdline-override.patch
@@ -43,7 +43,7 @@ Signed-off-by: Yoonji Park <koreapyj@dcmys.kr>
 +#ifdef CONFIG_CMDLINE_OVERRIDE
 +      p = of_get_flat_dt_prop(node, "bootargs-override", &l);
 +      if (p != NULL && l > 0)
-+              strscpy(cmdline, p, min((int)l, COMMAND_LINE_SIZE));
++              strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
 +#endif
 +
  handle_cmdline:

diff --git a/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch
index e7fb4bcd1b64c309497c0bd72691ada515b57203..2e526d6a30b9b2f663497b4707396d83acb8c8b9 100644 (file)
--- a/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch
+++ b/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch
@@ -29,7 +29,7 @@
 +#ifdef CONFIG_CMDLINE_OVERRIDE
 +      p = of_get_flat_dt_prop(node, "bootargs-override", &l);
 +      if (p != NULL && l > 0)
-+              strscpy(cmdline, p, COMMAND_LINE_SIZE);
++              strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
 +#endif
 +
  handle_cmdline:

diff --git a/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch
index 2fe98ff9ad306089a229e28b091a9dbfb931331e..6479766765b2a7c4864f179b11d43c32b14c28cd 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch
+++ b/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch
@@ -29,7 +29,7 @@
 +#ifdef CONFIG_CMDLINE_OVERRIDE
 +      p = of_get_flat_dt_prop(node, "bootargs-override", &l);
 +      if (p != NULL && l > 0)
-+              strscpy(cmdline, p, COMMAND_LINE_SIZE);
++              strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
 +#endif
 +
  handle_cmdline: