| Message ID | 1421299975.6988.2.camel@phoenix |
|---|---|
| State | Accepted |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
On 15 January 2015 at 11:02, Axel Lin <axel.lin@ingics.com> wrote: > The third parameter of container_of is the name of the member within the struct. > Current code only works if the parameter passed to to_cf_qspi_slave named slave. > Fix it. > > Signed-off-by: Axel Lin <axel.lin@ingics.com> > --- > drivers/spi/cf_qspi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/spi/cf_qspi.c b/drivers/spi/cf_qspi.c > index 6b85633..834c5bd 100644 > --- a/drivers/spi/cf_qspi.c > +++ b/drivers/spi/cf_qspi.c > @@ -20,7 +20,7 @@ > DECLARE_GLOBAL_DATA_PTR; > > #define clamp(x, low, high) (min(max(low, x), high)) > -#define to_cf_qspi_slave(s) container_of(s, struct cf_qspi_slave, s) > +#define to_cf_qspi_slave(s) container_of(s, struct cf_qspi_slave, slave) > > struct cf_qspi_slave { > struct spi_slave slave; /* Specific bus:cs ID for each device */ > -- > 1.9.1 > > > Applied to u-boot-spi/master thanks!
diff --git a/drivers/spi/cf_qspi.c b/drivers/spi/cf_qspi.c index 6b85633..834c5bd 100644 --- a/drivers/spi/cf_qspi.c +++ b/drivers/spi/cf_qspi.c @@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR; #define clamp(x, low, high) (min(max(low, x), high)) -#define to_cf_qspi_slave(s) container_of(s, struct cf_qspi_slave, s) +#define to_cf_qspi_slave(s) container_of(s, struct cf_qspi_slave, slave) struct cf_qspi_slave { struct spi_slave slave; /* Specific bus:cs ID for each device */
The third parameter of container_of is the name of the member within the struct. Current code only works if the parameter passed to to_cf_qspi_slave named slave. Fix it. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- drivers/spi/cf_qspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)