diff for duplicates of <5227956E.2050607@st.com> diff --git a/a/1.txt b/N1/1.txt index b147759..62bf776 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,31 +11,28 @@ Acked-by: Denis Ciocca <denis.ciocca@st.com> > include/linux/iio/common/st_sensors.h | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) > -> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressu= -re/st_pressure_core.c +> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c > index 423ed6a..3cf54ed 100644 > --- a/drivers/iio/pressure/st_pressure_core.c > +++ b/drivers/iio/pressure/st_pressure_core.c -> @@ -101,6 +101,7 @@ static const struct st_sensors st_press_sensors[] =3D= - { -> [0] =3D LPS331AP_PRESS_DEV_NAME, +> @@ -101,6 +101,7 @@ static const struct st_sensors st_press_sensors[] = { +> [0] = LPS331AP_PRESS_DEV_NAME, > }, -> .ch =3D (struct iio_chan_spec *)st_press_lsp331ap_channels, -> + .num_ch =3D ARRAY_SIZE(st_press_lsp331ap_channels), -> .odr =3D { -> .addr =3D ST_PRESS_LPS331AP_ODR_ADDR, -> .mask =3D ST_PRESS_LPS331AP_ODR_MASK, +> .ch = (struct iio_chan_spec *)st_press_lsp331ap_channels, +> + .num_ch = ARRAY_SIZE(st_press_lsp331ap_channels), +> .odr = { +> .addr = ST_PRESS_LPS331AP_ODR_ADDR, +> .mask = ST_PRESS_LPS331AP_ODR_MASK, > @@ -237,7 +238,7 @@ int st_press_common_probe(struct iio_dev *indio_dev) -> pdata->num_data_channels =3D ST_PRESS_NUMBER_DATA_CHANNELS; -> pdata->multiread_bit =3D pdata->sensor->multi_read_bit; -> indio_dev->channels =3D pdata->sensor->ch; -> - indio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels); -> + indio_dev->num_channels =3D pdata->sensor->num_ch; -> =20 -> if (pdata->sensor->fs.addr !=3D 0) -> pdata->current_fullscale =3D (struct st_sensor_fullscale_avl *) -> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/co= -mmon/st_sensors.h +> pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS; +> pdata->multiread_bit = pdata->sensor->multi_read_bit; +> indio_dev->channels = pdata->sensor->ch; +> - indio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels); +> + indio_dev->num_channels = pdata->sensor->num_ch; +> +> if (pdata->sensor->fs.addr != 0) +> pdata->current_fullscale = (struct st_sensor_fullscale_avl *) +> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h > index 72b2694..4aef925 100644 > --- a/include/linux/iio/common/st_sensors.h > +++ b/include/linux/iio/common/st_sensors.h diff --git a/a/content_digest b/N1/content_digest index 10b4755..19ab1ab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01378287103-21765-1-git-send-email-lee.jones@linaro.org\0" "ref\01378287103-21765-9-git-send-email-lee.jones@linaro.org\0" - "From\0Denis CIOCCA <denis.ciocca@st.com>\0" - "Subject\0Re: [PATCH 08/11] iio: pressure-core: st: Allow for number of channels to vary\0" + "From\0denis.ciocca@st.com (Denis CIOCCA)\0" + "Subject\0[PATCH 08/11] iio: pressure-core: st: Allow for number of channels to vary\0" "Date\0Wed, 4 Sep 2013 22:17:50 +0200\0" - "To\0Lee Jones <lee.jones@linaro.org>\0" - "Cc\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>" - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - jic23@cam.ac.uk <jic23@cam.ac.uk> - arnd@arndb.de <arnd@arndb.de> - linus.walleij@linaro.org <linus.walleij@linaro.org> - " linux-iio@vger.kernel.org <linux-iio@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Acked-by: Denis Ciocca <denis.ciocca@st.com>\n" @@ -25,31 +19,28 @@ "> include/linux/iio/common/st_sensors.h | 1 +\n" "> 2 files changed, 3 insertions(+), 1 deletion(-)\n" ">\n" - "> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressu=\n" - "re/st_pressure_core.c\n" + "> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c\n" "> index 423ed6a..3cf54ed 100644\n" "> --- a/drivers/iio/pressure/st_pressure_core.c\n" "> +++ b/drivers/iio/pressure/st_pressure_core.c\n" - "> @@ -101,6 +101,7 @@ static const struct st_sensors st_press_sensors[] =3D=\n" - " {\n" - "> \t\t\t[0] =3D LPS331AP_PRESS_DEV_NAME,\n" + "> @@ -101,6 +101,7 @@ static const struct st_sensors st_press_sensors[] = {\n" + "> \t\t\t[0] = LPS331AP_PRESS_DEV_NAME,\n" "> \t\t},\n" - "> \t\t.ch =3D (struct iio_chan_spec *)st_press_lsp331ap_channels,\n" - "> +\t\t.num_ch =3D ARRAY_SIZE(st_press_lsp331ap_channels),\n" - "> \t\t.odr =3D {\n" - "> \t\t\t.addr =3D ST_PRESS_LPS331AP_ODR_ADDR,\n" - "> \t\t\t.mask =3D ST_PRESS_LPS331AP_ODR_MASK,\n" + "> \t\t.ch = (struct iio_chan_spec *)st_press_lsp331ap_channels,\n" + "> +\t\t.num_ch = ARRAY_SIZE(st_press_lsp331ap_channels),\n" + "> \t\t.odr = {\n" + "> \t\t\t.addr = ST_PRESS_LPS331AP_ODR_ADDR,\n" + "> \t\t\t.mask = ST_PRESS_LPS331AP_ODR_MASK,\n" "> @@ -237,7 +238,7 @@ int st_press_common_probe(struct iio_dev *indio_dev)\n" - "> \tpdata->num_data_channels =3D ST_PRESS_NUMBER_DATA_CHANNELS;\n" - "> \tpdata->multiread_bit =3D pdata->sensor->multi_read_bit;\n" - "> \tindio_dev->channels =3D pdata->sensor->ch;\n" - "> -\tindio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels);\n" - "> +\tindio_dev->num_channels =3D pdata->sensor->num_ch;\n" - "> =20\n" - "> \tif (pdata->sensor->fs.addr !=3D 0)\n" - "> \t\tpdata->current_fullscale =3D (struct st_sensor_fullscale_avl *)\n" - "> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/co=\n" - "mmon/st_sensors.h\n" + "> \tpdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;\n" + "> \tpdata->multiread_bit = pdata->sensor->multi_read_bit;\n" + "> \tindio_dev->channels = pdata->sensor->ch;\n" + "> -\tindio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels);\n" + "> +\tindio_dev->num_channels = pdata->sensor->num_ch;\n" + "> \n" + "> \tif (pdata->sensor->fs.addr != 0)\n" + "> \t\tpdata->current_fullscale = (struct st_sensor_fullscale_avl *)\n" + "> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h\n" "> index 72b2694..4aef925 100644\n" "> --- a/include/linux/iio/common/st_sensors.h\n" "> +++ b/include/linux/iio/common/st_sensors.h\n" @@ -62,4 +53,4 @@ "> \tstruct st_sensor_power pw;\n" "> \tstruct st_sensor_axis enable_axis;" -f841bfbe4e1bb85960d4862b1e23408912f592b1b43236aa39412b205d25c3f9 +312f18e05852692ba8fbd02083663ba6bac350980f798ce71c253fbaf483fe64
diff --git a/a/1.txt b/N2/1.txt index b147759..62bf776 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,31 +11,28 @@ Acked-by: Denis Ciocca <denis.ciocca@st.com> > include/linux/iio/common/st_sensors.h | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) > -> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressu= -re/st_pressure_core.c +> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c > index 423ed6a..3cf54ed 100644 > --- a/drivers/iio/pressure/st_pressure_core.c > +++ b/drivers/iio/pressure/st_pressure_core.c -> @@ -101,6 +101,7 @@ static const struct st_sensors st_press_sensors[] =3D= - { -> [0] =3D LPS331AP_PRESS_DEV_NAME, +> @@ -101,6 +101,7 @@ static const struct st_sensors st_press_sensors[] = { +> [0] = LPS331AP_PRESS_DEV_NAME, > }, -> .ch =3D (struct iio_chan_spec *)st_press_lsp331ap_channels, -> + .num_ch =3D ARRAY_SIZE(st_press_lsp331ap_channels), -> .odr =3D { -> .addr =3D ST_PRESS_LPS331AP_ODR_ADDR, -> .mask =3D ST_PRESS_LPS331AP_ODR_MASK, +> .ch = (struct iio_chan_spec *)st_press_lsp331ap_channels, +> + .num_ch = ARRAY_SIZE(st_press_lsp331ap_channels), +> .odr = { +> .addr = ST_PRESS_LPS331AP_ODR_ADDR, +> .mask = ST_PRESS_LPS331AP_ODR_MASK, > @@ -237,7 +238,7 @@ int st_press_common_probe(struct iio_dev *indio_dev) -> pdata->num_data_channels =3D ST_PRESS_NUMBER_DATA_CHANNELS; -> pdata->multiread_bit =3D pdata->sensor->multi_read_bit; -> indio_dev->channels =3D pdata->sensor->ch; -> - indio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels); -> + indio_dev->num_channels =3D pdata->sensor->num_ch; -> =20 -> if (pdata->sensor->fs.addr !=3D 0) -> pdata->current_fullscale =3D (struct st_sensor_fullscale_avl *) -> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/co= -mmon/st_sensors.h +> pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS; +> pdata->multiread_bit = pdata->sensor->multi_read_bit; +> indio_dev->channels = pdata->sensor->ch; +> - indio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels); +> + indio_dev->num_channels = pdata->sensor->num_ch; +> +> if (pdata->sensor->fs.addr != 0) +> pdata->current_fullscale = (struct st_sensor_fullscale_avl *) +> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h > index 72b2694..4aef925 100644 > --- a/include/linux/iio/common/st_sensors.h > +++ b/include/linux/iio/common/st_sensors.h diff --git a/a/content_digest b/N2/content_digest index 10b4755..57198e1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -25,31 +25,28 @@ "> include/linux/iio/common/st_sensors.h | 1 +\n" "> 2 files changed, 3 insertions(+), 1 deletion(-)\n" ">\n" - "> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressu=\n" - "re/st_pressure_core.c\n" + "> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c\n" "> index 423ed6a..3cf54ed 100644\n" "> --- a/drivers/iio/pressure/st_pressure_core.c\n" "> +++ b/drivers/iio/pressure/st_pressure_core.c\n" - "> @@ -101,6 +101,7 @@ static const struct st_sensors st_press_sensors[] =3D=\n" - " {\n" - "> \t\t\t[0] =3D LPS331AP_PRESS_DEV_NAME,\n" + "> @@ -101,6 +101,7 @@ static const struct st_sensors st_press_sensors[] = {\n" + "> \t\t\t[0] = LPS331AP_PRESS_DEV_NAME,\n" "> \t\t},\n" - "> \t\t.ch =3D (struct iio_chan_spec *)st_press_lsp331ap_channels,\n" - "> +\t\t.num_ch =3D ARRAY_SIZE(st_press_lsp331ap_channels),\n" - "> \t\t.odr =3D {\n" - "> \t\t\t.addr =3D ST_PRESS_LPS331AP_ODR_ADDR,\n" - "> \t\t\t.mask =3D ST_PRESS_LPS331AP_ODR_MASK,\n" + "> \t\t.ch = (struct iio_chan_spec *)st_press_lsp331ap_channels,\n" + "> +\t\t.num_ch = ARRAY_SIZE(st_press_lsp331ap_channels),\n" + "> \t\t.odr = {\n" + "> \t\t\t.addr = ST_PRESS_LPS331AP_ODR_ADDR,\n" + "> \t\t\t.mask = ST_PRESS_LPS331AP_ODR_MASK,\n" "> @@ -237,7 +238,7 @@ int st_press_common_probe(struct iio_dev *indio_dev)\n" - "> \tpdata->num_data_channels =3D ST_PRESS_NUMBER_DATA_CHANNELS;\n" - "> \tpdata->multiread_bit =3D pdata->sensor->multi_read_bit;\n" - "> \tindio_dev->channels =3D pdata->sensor->ch;\n" - "> -\tindio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels);\n" - "> +\tindio_dev->num_channels =3D pdata->sensor->num_ch;\n" - "> =20\n" - "> \tif (pdata->sensor->fs.addr !=3D 0)\n" - "> \t\tpdata->current_fullscale =3D (struct st_sensor_fullscale_avl *)\n" - "> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/co=\n" - "mmon/st_sensors.h\n" + "> \tpdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;\n" + "> \tpdata->multiread_bit = pdata->sensor->multi_read_bit;\n" + "> \tindio_dev->channels = pdata->sensor->ch;\n" + "> -\tindio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels);\n" + "> +\tindio_dev->num_channels = pdata->sensor->num_ch;\n" + "> \n" + "> \tif (pdata->sensor->fs.addr != 0)\n" + "> \t\tpdata->current_fullscale = (struct st_sensor_fullscale_avl *)\n" + "> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h\n" "> index 72b2694..4aef925 100644\n" "> --- a/include/linux/iio/common/st_sensors.h\n" "> +++ b/include/linux/iio/common/st_sensors.h\n" @@ -62,4 +59,4 @@ "> \tstruct st_sensor_power pw;\n" "> \tstruct st_sensor_axis enable_axis;" -f841bfbe4e1bb85960d4862b1e23408912f592b1b43236aa39412b205d25c3f9 +2f9ca7ad40f986c0d723e48fd077d7d87a730a269300d959e9b31a7693946cfa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.