* [PATCH 2/3] param: fix stub prototype of dev_add_param
2017-05-11 9:41 [PATCH 1/3] ARM: socfpga: fix QSPI platform data init Lucas Stach
@ 2017-05-11 9:41 ` Lucas Stach
2017-05-11 9:41 ` [PATCH 3/3] mtd: only build mtdraw_raw_to_mtd_offset when write support is enabled Lucas Stach
2017-05-17 6:18 ` [PATCH 1/3] ARM: socfpga: fix QSPI platform data init Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Stach @ 2017-05-11 9:41 UTC (permalink / raw)
To: barebox
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
include/param.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/param.h b/include/param.h
index 963722983869..dea9d8824419 100644
--- a/include/param.h
+++ b/include/param.h
@@ -102,8 +102,8 @@ static inline struct param_d *get_param_by_name(struct device_d *dev,
}
static inline struct param_d *dev_add_param(struct device_d *dev, const char *name,
- int (*set)(struct device_d *dev, struct param_d *p, const char *val),
- const char *(*get)(struct device_d *, struct param_d *p),
+ int (*set)(struct param_d *p, const char *val),
+ const char *(*get)(struct param_d *p),
unsigned long flags)
{
return ERR_PTR(-ENOSYS);
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 3/3] mtd: only build mtdraw_raw_to_mtd_offset when write support is enabled
2017-05-11 9:41 [PATCH 1/3] ARM: socfpga: fix QSPI platform data init Lucas Stach
2017-05-11 9:41 ` [PATCH 2/3] param: fix stub prototype of dev_add_param Lucas Stach
@ 2017-05-11 9:41 ` Lucas Stach
2017-05-17 6:18 ` [PATCH 1/3] ARM: socfpga: fix QSPI platform data init Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Stach @ 2017-05-11 9:41 UTC (permalink / raw)
To: barebox
mtdraw_raw_to_mtd_offset() is only used from mtdraw_erase(), so will
only be referenced when MTD write support is enabled. This fixes a
harmless warning.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
drivers/mtd/mtdraw.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/mtdraw.c b/drivers/mtd/mtdraw.c
index d0b5f759263d..ab360b78623a 100644
--- a/drivers/mtd/mtdraw.c
+++ b/drivers/mtd/mtdraw.c
@@ -92,11 +92,6 @@ static unsigned int mtdraw_offset_to_block(struct mtd_info *mtd, loff_t offset)
return ofs64;
}
-static loff_t mtdraw_raw_to_mtd_offset(struct mtd_info *mtd, loff_t offset)
-{
- return (loff_t)mtdraw_offset_to_block(mtd, offset) * mtd->writesize;
-}
-
static ssize_t mtdraw_read_unaligned(struct mtd_info *mtd, void *dst,
size_t count, int skip, ulong offset)
{
@@ -159,6 +154,11 @@ static ssize_t mtdraw_read(struct cdev *cdev, void *buf, size_t count,
}
#ifdef CONFIG_MTD_WRITE
+static loff_t mtdraw_raw_to_mtd_offset(struct mtd_info *mtd, loff_t offset)
+{
+ return (loff_t)mtdraw_offset_to_block(mtd, offset) * mtd->writesize;
+}
+
static ssize_t mtdraw_blkwrite(struct mtd_info *mtd, const void *buf,
ulong offset)
{
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/3] ARM: socfpga: fix QSPI platform data init
2017-05-11 9:41 [PATCH 1/3] ARM: socfpga: fix QSPI platform data init Lucas Stach
2017-05-11 9:41 ` [PATCH 2/3] param: fix stub prototype of dev_add_param Lucas Stach
2017-05-11 9:41 ` [PATCH 3/3] mtd: only build mtdraw_raw_to_mtd_offset when write support is enabled Lucas Stach
@ 2017-05-17 6:18 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2017-05-17 6:18 UTC (permalink / raw)
To: Lucas Stach; +Cc: barebox
On Thu, May 11, 2017 at 11:41:06AM +0200, Lucas Stach wrote:
> The struct member has been renamed, fix it.
>
> Fixes: fddf254b8b9a (mtd: spi-nor: cadence: change devicetree bindings to upstream)
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> arch/arm/mach-socfpga/cyclone5-generic.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/mach-socfpga/cyclone5-generic.c b/arch/arm/mach-socfpga/cyclone5-generic.c
> index 3f49a9a542eb..73a8ad03b738 100644
> --- a/arch/arm/mach-socfpga/cyclone5-generic.c
> +++ b/arch/arm/mach-socfpga/cyclone5-generic.c
> @@ -53,7 +53,7 @@ void socfpga_cyclone5_mmc_init(void)
>
> #if defined(CONFIG_SPI_CADENCE_QUADSPI)
> static struct cadence_qspi_platform_data qspi_pdata = {
> - .ext_decoder = 0,
> + .is_decoded_cs = 0,
> .fifo_depth = 128,
> };
>
> --
> 2.11.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread