diff for duplicates of <52279545.5070903@st.com> diff --git a/a/1.txt b/N1/1.txt index c3c302b..3e2ce77 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,6 @@ Acked-by: Denis Ciocca <denis.ciocca@st.com> -> Some chips either don't support it or fail to provide adequate documentat= -ion, -> so sometimes it's impossible to enable the feature even if it is supporte= -d. +> Some chips either don't support it or fail to provide adequate documentation, +> so sometimes it's impossible to enable the feature even if it is supported. > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- @@ -10,45 +8,42 @@ d. > drivers/iio/pressure/st_pressure_core.c | 6 ++++-- > 2 files changed, 11 insertions(+), 6 deletions(-) > -> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/ii= -o/common/st_sensors/st_sensors_core.c +> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c > index 865b178..fc9acb7 100644 > --- a/drivers/iio/common/st_sensors/st_sensors_core.c > +++ b/drivers/iio/common/st_sensors/st_sensors_core.c -> @@ -209,10 +209,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_de= -v) +> @@ -209,10 +209,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev) > if (err < 0) > goto init_error; -> =20 -> - err =3D st_sensors_set_fullscale(indio_dev, +> +> - err = st_sensors_set_fullscale(indio_dev, > - sdata->current_fullscale->num); > - if (err < 0) > - goto init_error; > + if (sdata->current_fullscale) { -> + err =3D st_sensors_set_fullscale(indio_dev, +> + err = st_sensors_set_fullscale(indio_dev, > + sdata->current_fullscale->num); > + if (err < 0) > + goto init_error; > + } else > + dev_info(&indio_dev->dev, "Full-scale not possible\n"); -> =20 -> err =3D st_sensors_set_odr(indio_dev, sdata->odr); +> +> err = st_sensors_set_odr(indio_dev, sdata->odr); > if (err < 0) -> 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 7ba9299..423ed6a 100644 > --- a/drivers/iio/pressure/st_pressure_core.c > +++ b/drivers/iio/pressure/st_pressure_core.c > @@ -239,8 +239,10 @@ int st_press_common_probe(struct iio_dev *indio_dev) -> indio_dev->channels =3D pdata->sensor->ch; -> indio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels); -> =20 -> - pdata->current_fullscale =3D (struct st_sensor_fullscale_avl *) +> indio_dev->channels = pdata->sensor->ch; +> indio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels); +> +> - pdata->current_fullscale = (struct st_sensor_fullscale_avl *) > - &pdata->sensor->fs.fs_avl[0]; -> + if (pdata->sensor->fs.addr !=3D 0) -> + pdata->current_fullscale =3D (struct st_sensor_fullscale_avl *) +> + if (pdata->sensor->fs.addr != 0) +> + pdata->current_fullscale = (struct st_sensor_fullscale_avl *) > + &pdata->sensor->fs.fs_avl[0]; > + -> pdata->odr =3D pdata->sensor->odr.odr_avl[0].hz; -> =20 -> err =3D st_sensors_init_sensor(indio_dev); +> pdata->odr = pdata->sensor->odr.odr_avl[0].hz; +> +> err = st_sensors_init_sensor(indio_dev); diff --git a/a/content_digest b/N1/content_digest index 9d696a6..d78596f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,14 @@ "ref\01378287103-21765-1-git-send-email-lee.jones@linaro.org\0" "ref\01378287103-21765-8-git-send-email-lee.jones@linaro.org\0" - "From\0Denis CIOCCA <denis.ciocca@st.com>\0" - "Subject\0Re: [PATCH 07/11] iio: sensors-core: st: Allow full-scale to be an optional feature\0" + "From\0denis.ciocca@st.com (Denis CIOCCA)\0" + "Subject\0[PATCH 07/11] iio: sensors-core: st: Allow full-scale to be an optional feature\0" "Date\0Wed, 4 Sep 2013 22:17:09 +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" - "> Some chips either don't support it or fail to provide adequate documentat=\n" - "ion,\n" - "> so sometimes it's impossible to enable the feature even if it is supporte=\n" - "d.\n" + "> Some chips either don't support it or fail to provide adequate documentation,\n" + "> so sometimes it's impossible to enable the feature even if it is supported.\n" ">\n" "> Signed-off-by: Lee Jones <lee.jones@linaro.org>\n" "> ---\n" @@ -24,47 +16,44 @@ "> drivers/iio/pressure/st_pressure_core.c | 6 ++++--\n" "> 2 files changed, 11 insertions(+), 6 deletions(-)\n" ">\n" - "> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/ii=\n" - "o/common/st_sensors/st_sensors_core.c\n" + "> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c\n" "> index 865b178..fc9acb7 100644\n" "> --- a/drivers/iio/common/st_sensors/st_sensors_core.c\n" "> +++ b/drivers/iio/common/st_sensors/st_sensors_core.c\n" - "> @@ -209,10 +209,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_de=\n" - "v)\n" + "> @@ -209,10 +209,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev)\n" "> \tif (err < 0)\n" "> \t\tgoto init_error;\n" - "> =20\n" - "> -\terr =3D st_sensors_set_fullscale(indio_dev,\n" + "> \n" + "> -\terr = st_sensors_set_fullscale(indio_dev,\n" "> -\t\t\t\t\t\tsdata->current_fullscale->num);\n" "> -\tif (err < 0)\n" "> -\t\tgoto init_error;\n" "> +\tif (sdata->current_fullscale) {\n" - "> +\t\terr =3D st_sensors_set_fullscale(indio_dev,\n" + "> +\t\terr = st_sensors_set_fullscale(indio_dev,\n" "> +\t\t\t\t\t sdata->current_fullscale->num);\n" "> +\t\tif (err < 0)\n" "> +\t\t\tgoto init_error;\n" "> +\t} else\n" "> +\t\tdev_info(&indio_dev->dev, \"Full-scale not possible\\n\");\n" - "> =20\n" - "> \terr =3D st_sensors_set_odr(indio_dev, sdata->odr);\n" + "> \n" + "> \terr = st_sensors_set_odr(indio_dev, sdata->odr);\n" "> \tif (err < 0)\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 7ba9299..423ed6a 100644\n" "> --- a/drivers/iio/pressure/st_pressure_core.c\n" "> +++ b/drivers/iio/pressure/st_pressure_core.c\n" "> @@ -239,8 +239,10 @@ int st_press_common_probe(struct iio_dev *indio_dev)\n" - "> \tindio_dev->channels =3D pdata->sensor->ch;\n" - "> \tindio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels);\n" - "> =20\n" - "> -\tpdata->current_fullscale =3D (struct st_sensor_fullscale_avl *)\n" + "> \tindio_dev->channels = pdata->sensor->ch;\n" + "> \tindio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels);\n" + "> \n" + "> -\tpdata->current_fullscale = (struct st_sensor_fullscale_avl *)\n" "> -\t\t\t\t\t\t&pdata->sensor->fs.fs_avl[0];\n" - "> +\tif (pdata->sensor->fs.addr !=3D 0)\n" - "> +\t\tpdata->current_fullscale =3D (struct st_sensor_fullscale_avl *)\n" + "> +\tif (pdata->sensor->fs.addr != 0)\n" + "> +\t\tpdata->current_fullscale = (struct st_sensor_fullscale_avl *)\n" "> +\t\t\t&pdata->sensor->fs.fs_avl[0];\n" "> +\n" - "> \tpdata->odr =3D pdata->sensor->odr.odr_avl[0].hz;\n" - "> =20\n" - "> \terr =3D st_sensors_init_sensor(indio_dev);" + "> \tpdata->odr = pdata->sensor->odr.odr_avl[0].hz;\n" + "> \n" + "> \terr = st_sensors_init_sensor(indio_dev);" -5b9e93126cd7b18f890f50f5446edb12fefe0ad682f539847023fa5357bb7289 +150c7c85c0bf0f7c85d487a282bc7f75d7056cd4277e433f23f160035abdd828
diff --git a/a/1.txt b/N2/1.txt index c3c302b..3e2ce77 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,8 +1,6 @@ Acked-by: Denis Ciocca <denis.ciocca@st.com> -> Some chips either don't support it or fail to provide adequate documentat= -ion, -> so sometimes it's impossible to enable the feature even if it is supporte= -d. +> Some chips either don't support it or fail to provide adequate documentation, +> so sometimes it's impossible to enable the feature even if it is supported. > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- @@ -10,45 +8,42 @@ d. > drivers/iio/pressure/st_pressure_core.c | 6 ++++-- > 2 files changed, 11 insertions(+), 6 deletions(-) > -> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/ii= -o/common/st_sensors/st_sensors_core.c +> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c > index 865b178..fc9acb7 100644 > --- a/drivers/iio/common/st_sensors/st_sensors_core.c > +++ b/drivers/iio/common/st_sensors/st_sensors_core.c -> @@ -209,10 +209,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_de= -v) +> @@ -209,10 +209,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev) > if (err < 0) > goto init_error; -> =20 -> - err =3D st_sensors_set_fullscale(indio_dev, +> +> - err = st_sensors_set_fullscale(indio_dev, > - sdata->current_fullscale->num); > - if (err < 0) > - goto init_error; > + if (sdata->current_fullscale) { -> + err =3D st_sensors_set_fullscale(indio_dev, +> + err = st_sensors_set_fullscale(indio_dev, > + sdata->current_fullscale->num); > + if (err < 0) > + goto init_error; > + } else > + dev_info(&indio_dev->dev, "Full-scale not possible\n"); -> =20 -> err =3D st_sensors_set_odr(indio_dev, sdata->odr); +> +> err = st_sensors_set_odr(indio_dev, sdata->odr); > if (err < 0) -> 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 7ba9299..423ed6a 100644 > --- a/drivers/iio/pressure/st_pressure_core.c > +++ b/drivers/iio/pressure/st_pressure_core.c > @@ -239,8 +239,10 @@ int st_press_common_probe(struct iio_dev *indio_dev) -> indio_dev->channels =3D pdata->sensor->ch; -> indio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels); -> =20 -> - pdata->current_fullscale =3D (struct st_sensor_fullscale_avl *) +> indio_dev->channels = pdata->sensor->ch; +> indio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels); +> +> - pdata->current_fullscale = (struct st_sensor_fullscale_avl *) > - &pdata->sensor->fs.fs_avl[0]; -> + if (pdata->sensor->fs.addr !=3D 0) -> + pdata->current_fullscale =3D (struct st_sensor_fullscale_avl *) +> + if (pdata->sensor->fs.addr != 0) +> + pdata->current_fullscale = (struct st_sensor_fullscale_avl *) > + &pdata->sensor->fs.fs_avl[0]; > + -> pdata->odr =3D pdata->sensor->odr.odr_avl[0].hz; -> =20 -> err =3D st_sensors_init_sensor(indio_dev); +> pdata->odr = pdata->sensor->odr.odr_avl[0].hz; +> +> err = st_sensors_init_sensor(indio_dev); diff --git a/a/content_digest b/N2/content_digest index 9d696a6..d826f9d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -13,10 +13,8 @@ "\00:1\0" "b\0" "Acked-by: Denis Ciocca <denis.ciocca@st.com>\n" - "> Some chips either don't support it or fail to provide adequate documentat=\n" - "ion,\n" - "> so sometimes it's impossible to enable the feature even if it is supporte=\n" - "d.\n" + "> Some chips either don't support it or fail to provide adequate documentation,\n" + "> so sometimes it's impossible to enable the feature even if it is supported.\n" ">\n" "> Signed-off-by: Lee Jones <lee.jones@linaro.org>\n" "> ---\n" @@ -24,47 +22,44 @@ "> drivers/iio/pressure/st_pressure_core.c | 6 ++++--\n" "> 2 files changed, 11 insertions(+), 6 deletions(-)\n" ">\n" - "> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/ii=\n" - "o/common/st_sensors/st_sensors_core.c\n" + "> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c\n" "> index 865b178..fc9acb7 100644\n" "> --- a/drivers/iio/common/st_sensors/st_sensors_core.c\n" "> +++ b/drivers/iio/common/st_sensors/st_sensors_core.c\n" - "> @@ -209,10 +209,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_de=\n" - "v)\n" + "> @@ -209,10 +209,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev)\n" "> \tif (err < 0)\n" "> \t\tgoto init_error;\n" - "> =20\n" - "> -\terr =3D st_sensors_set_fullscale(indio_dev,\n" + "> \n" + "> -\terr = st_sensors_set_fullscale(indio_dev,\n" "> -\t\t\t\t\t\tsdata->current_fullscale->num);\n" "> -\tif (err < 0)\n" "> -\t\tgoto init_error;\n" "> +\tif (sdata->current_fullscale) {\n" - "> +\t\terr =3D st_sensors_set_fullscale(indio_dev,\n" + "> +\t\terr = st_sensors_set_fullscale(indio_dev,\n" "> +\t\t\t\t\t sdata->current_fullscale->num);\n" "> +\t\tif (err < 0)\n" "> +\t\t\tgoto init_error;\n" "> +\t} else\n" "> +\t\tdev_info(&indio_dev->dev, \"Full-scale not possible\\n\");\n" - "> =20\n" - "> \terr =3D st_sensors_set_odr(indio_dev, sdata->odr);\n" + "> \n" + "> \terr = st_sensors_set_odr(indio_dev, sdata->odr);\n" "> \tif (err < 0)\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 7ba9299..423ed6a 100644\n" "> --- a/drivers/iio/pressure/st_pressure_core.c\n" "> +++ b/drivers/iio/pressure/st_pressure_core.c\n" "> @@ -239,8 +239,10 @@ int st_press_common_probe(struct iio_dev *indio_dev)\n" - "> \tindio_dev->channels =3D pdata->sensor->ch;\n" - "> \tindio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels);\n" - "> =20\n" - "> -\tpdata->current_fullscale =3D (struct st_sensor_fullscale_avl *)\n" + "> \tindio_dev->channels = pdata->sensor->ch;\n" + "> \tindio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels);\n" + "> \n" + "> -\tpdata->current_fullscale = (struct st_sensor_fullscale_avl *)\n" "> -\t\t\t\t\t\t&pdata->sensor->fs.fs_avl[0];\n" - "> +\tif (pdata->sensor->fs.addr !=3D 0)\n" - "> +\t\tpdata->current_fullscale =3D (struct st_sensor_fullscale_avl *)\n" + "> +\tif (pdata->sensor->fs.addr != 0)\n" + "> +\t\tpdata->current_fullscale = (struct st_sensor_fullscale_avl *)\n" "> +\t\t\t&pdata->sensor->fs.fs_avl[0];\n" "> +\n" - "> \tpdata->odr =3D pdata->sensor->odr.odr_avl[0].hz;\n" - "> =20\n" - "> \terr =3D st_sensors_init_sensor(indio_dev);" + "> \tpdata->odr = pdata->sensor->odr.odr_avl[0].hz;\n" + "> \n" + "> \terr = st_sensors_init_sensor(indio_dev);" -5b9e93126cd7b18f890f50f5446edb12fefe0ad682f539847023fa5357bb7289 +33addb24f391a9c4fb2d62cd691b18a28185197d1e9e864a71c59f47fe4b9840
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.