summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-08-23 19:52:28 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2018-08-31 08:30:07 +0200
commitcd3bcfa1b98865bf9598e48c63ce61c85de693d8 (patch)
tree9e2e1f6ebd58b53aa54af46226595a12cc27741c /arch/arm/mach-imx
parent2969b89e7b2c8bd20d7c36fbab96804d24932b68 (diff)
downloadbarebox-cd3bcfa1b98865bf9598e48c63ce61c85de693d8.tar.gz
barebox-cd3bcfa1b98865bf9598e48c63ce61c85de693d8.tar.xz
ARM: i.MX: bbu: Constify all 'devicefile' arguments
Constify all 'devicefile' arguments since they are treated as so by all of the users in BBU code. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/imx-bbu-external-nand.c2
-rw-r--r--arch/arm/mach-imx/imx-bbu-internal.c40
-rw-r--r--arch/arm/mach-imx/include/mach/bbu.h40
3 files changed, 45 insertions, 37 deletions
diff --git a/arch/arm/mach-imx/imx-bbu-external-nand.c b/arch/arm/mach-imx/imx-bbu-external-nand.c
index 0f1a028f98..52622ac4cb 100644
--- a/arch/arm/mach-imx/imx-bbu-external-nand.c
+++ b/arch/arm/mach-imx/imx-bbu-external-nand.c
@@ -190,7 +190,7 @@ out:
* each bit represents a single block. With 2k NAND flashes this is enough for
* 4MiB size including bad blocks.
*/
-int imx_bbu_external_nand_register_handler(const char *name, char *devicefile,
+int imx_bbu_external_nand_register_handler(const char *name, const char *devicefile,
unsigned long flags)
{
struct bbu_handler *handler;
diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c
index add353914c..be17189f12 100644
--- a/arch/arm/mach-imx/imx-bbu-internal.c
+++ b/arch/arm/mach-imx/imx-bbu-internal.c
@@ -396,8 +396,9 @@ free_bootpartvar:
return ret;
}
-static struct imx_internal_bbu_handler *__init_handler(const char *name, char *devicefile,
- unsigned long flags)
+static struct imx_internal_bbu_handler *__init_handler(const char *name,
+ const char *devicefile,
+ unsigned long flags)
{
struct imx_internal_bbu_handler *imx_handler;
struct bbu_handler *handler;
@@ -427,7 +428,7 @@ static int __register_handler(struct imx_internal_bbu_handler *imx_handler)
}
static int
-imx_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+imx_bbu_internal_mmc_register_handler(const char *name, const char *devicefile,
unsigned long flags,
enum filetype expected_type)
{
@@ -443,7 +444,7 @@ imx_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
}
int imx51_bbu_internal_spi_i2c_register_handler(const char *name,
- char *devicefile, unsigned long flags)
+ const char *devicefile, unsigned long flags)
{
struct imx_internal_bbu_handler *imx_handler;
@@ -457,8 +458,9 @@ int imx51_bbu_internal_spi_i2c_register_handler(const char *name,
/*
* Register an i.MX51 internal boot update handler for MMC/SD
*/
-int imx51_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
- unsigned long flags)
+int imx51_bbu_internal_mmc_register_handler(const char *name,
+ const char *devicefile,
+ unsigned long flags)
{
return imx_bbu_internal_mmc_register_handler(name, devicefile, flags,
@@ -468,8 +470,9 @@ int imx51_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
/*
* Register an i.MX53 internal boot update handler for MMC/SD
*/
-int imx53_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
- unsigned long flags)
+int imx53_bbu_internal_mmc_register_handler(const char *name,
+ const char *devicefile,
+ unsigned long flags)
{
return imx_bbu_internal_mmc_register_handler(name, devicefile, flags,
filetype_imx_image_v2);
@@ -480,8 +483,9 @@ int imx53_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
* EEPROMs / flashes. Nearly the same as MMC/SD, but we do not need to
* keep a partition table. We have to erase the device beforehand though.
*/
-int imx53_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile,
- unsigned long flags)
+int imx53_bbu_internal_spi_i2c_register_handler(const char *name,
+ const char *devicefile,
+ unsigned long flags)
{
struct imx_internal_bbu_handler *imx_handler;
@@ -515,14 +519,16 @@ int imx53_bbu_internal_nand_register_handler(const char *name,
/*
* Register an i.MX6 internal boot update handler for MMC/SD
*/
-int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+int imx6_bbu_internal_mmc_register_handler(const char *name,
+ const char *devicefile,
unsigned long flags)
__alias(imx53_bbu_internal_mmc_register_handler);
/*
* Register an VF610 internal boot update handler for MMC/SD
*/
-int vf610_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+int vf610_bbu_internal_mmc_register_handler(const char *name,
+ const char *devicefile,
unsigned long flags)
__alias(imx6_bbu_internal_mmc_register_handler);
@@ -535,7 +541,8 @@ int vf610_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
* Note that no further partitioning of the boot partition is supported up to
* now.
*/
-int imx6_bbu_internal_mmcboot_register_handler(const char *name, char *devicefile,
+int imx6_bbu_internal_mmcboot_register_handler(const char *name,
+ const char *devicefile,
unsigned long flags)
{
struct imx_internal_bbu_handler *imx_handler;
@@ -554,12 +561,13 @@ int imx6_bbu_internal_mmcboot_register_handler(const char *name, char *devicefil
* keep a partition table. We have to erase the device beforehand though.
*/
int imx6_bbu_internal_spi_i2c_register_handler(const char *name,
- char *devicefile,
+ const char *devicefile,
unsigned long flags)
__alias(imx53_bbu_internal_spi_i2c_register_handler);
-int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
- unsigned long flags)
+int imx_bbu_external_nor_register_handler(const char *name,
+ const char *devicefile,
+ unsigned long flags)
{
struct imx_internal_bbu_handler *imx_handler;
diff --git a/arch/arm/mach-imx/include/mach/bbu.h b/arch/arm/mach-imx/include/mach/bbu.h
index b9b2c5bcba..b16766c751 100644
--- a/arch/arm/mach-imx/include/mach/bbu.h
+++ b/arch/arm/mach-imx/include/mach/bbu.h
@@ -32,57 +32,57 @@ struct imx_dcd_v2_entry;
#ifdef CONFIG_BAREBOX_UPDATE
-int imx51_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+int imx51_bbu_internal_mmc_register_handler(const char *name, const char *devicefile,
unsigned long flags);
int imx51_bbu_internal_spi_i2c_register_handler(const char *name,
- char *devicefile, unsigned long flags);
+ const char *devicefile, unsigned long flags);
-int imx53_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+int imx53_bbu_internal_mmc_register_handler(const char *name, const char *devicefile,
unsigned long flags);
-int imx53_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile,
+int imx53_bbu_internal_spi_i2c_register_handler(const char *name, const char *devicefile,
unsigned long flags);
int imx53_bbu_internal_nand_register_handler(const char *name,
unsigned long flags, int partition_size);
-int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+int imx6_bbu_internal_mmc_register_handler(const char *name, const char *devicefile,
unsigned long flags);
-int imx6_bbu_internal_mmcboot_register_handler(const char *name, char *devicefile,
+int imx6_bbu_internal_mmcboot_register_handler(const char *name, const char *devicefile,
unsigned long flags);
-int imx6_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile,
+int imx6_bbu_internal_spi_i2c_register_handler(const char *name, const char *devicefile,
unsigned long flags);
-int vf610_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+int vf610_bbu_internal_mmc_register_handler(const char *name, const char *devicefile,
unsigned long flags);
-int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
+int imx_bbu_external_nor_register_handler(const char *name, const char *devicefile,
unsigned long flags);
#else
-static inline int imx51_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+static inline int imx51_bbu_internal_mmc_register_handler(const char *name, const char *devicefile,
unsigned long flags)
{
return -ENOSYS;
}
static inline int imx51_bbu_internal_spi_i2c_register_handler(const char *name,
- char *devicefile, unsigned long flags)
+ const char *devicefile, unsigned long flags)
{
return -ENOSYS;
}
-static inline int imx53_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+static inline int imx53_bbu_internal_mmc_register_handler(const char *name, const char *devicefile,
unsigned long flags)
{
return -ENOSYS;
}
-static inline int imx53_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile,
+static inline int imx53_bbu_internal_spi_i2c_register_handler(const char *name, const char *devicefile,
unsigned long flags)
{
return -ENOSYS;
@@ -94,32 +94,32 @@ static inline int imx53_bbu_internal_nand_register_handler(const char *name,
return -ENOSYS;
}
-static inline int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+static inline int imx6_bbu_internal_mmc_register_handler(const char *name, const char *devicefile,
unsigned long flags)
{
return -ENOSYS;
}
static inline int imx6_bbu_internal_mmcboot_register_handler(const char *name,
- char *devicefile,
+ const char *devicefile,
unsigned long flags)
{
return -ENOSYS;
}
-static inline int imx6_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile,
+static inline int imx6_bbu_internal_spi_i2c_register_handler(const char *name, const char *devicefile,
unsigned long flags)
{
return -ENOSYS;
}
-static inline int vf610_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
+static inline int vf610_bbu_internal_mmc_register_handler(const char *name, const char *devicefile,
unsigned long flags)
{
return -ENOSYS;
}
-static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
+static inline int imx_bbu_external_nor_register_handler(const char *name, const char *devicefile,
unsigned long flags)
{
return -ENOSYS;
@@ -127,10 +127,10 @@ static inline int imx_bbu_external_nor_register_handler(const char *name, char *
#endif
#if defined(CONFIG_BAREBOX_UPDATE_IMX_EXTERNAL_NAND)
-int imx_bbu_external_nand_register_handler(const char *name, char *devicefile,
+int imx_bbu_external_nand_register_handler(const char *name, const char *devicefile,
unsigned long flags);
#else
-static inline int imx_bbu_external_nand_register_handler(const char *name, char *devicefile,
+static inline int imx_bbu_external_nand_register_handler(const char *name, const char *devicefile,
unsigned long flags)
{
return -ENOSYS;