diff for duplicates of <20180323134837.00002ab0@huawei.com> diff --git a/a/1.txt b/N1/1.txt index 0118a9c..3bccb88 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,25 +1,24 @@ On Wed, 21 Mar 2018 11:28:55 -0300 -Hern=E1n Gonzalez <hernan@vanguardiasur.com.ar> wrote: +Hernán Gonzalez <hernan@vanguardiasur.com.ar> wrote: > This allows the driver to be probed and removed as a module. ->=20 -> Signed-off-by: Hern=E1n Gonzalez <hernan@vanguardiasur.com.ar> +> +> Signed-off-by: Hernán Gonzalez <hernan@vanguardiasur.com.ar> > --- > drivers/staging/iio/cdc/ad7746.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) ->=20 -> diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/a= -d7746.c +> +> diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c > index 815573c..8abba71 100644 > --- a/drivers/staging/iio/cdc/ad7746.c > +++ b/drivers/staging/iio/cdc/ad7746.c > @@ -768,6 +768,15 @@ static int ad7746_probe(struct i2c_client *client, > return 0; > } -> =20 +> > +static int ad7746_remove(struct i2c_client *client) > +{ -> + struct iio_dev *indio_dev =3D i2c_get_clientdata(client); +> + struct iio_dev *indio_dev = i2c_get_clientdata(client); > + > + iio_device_unregister(indio_dev); Remove is not required to allow a driver to be removed.. @@ -38,14 +37,14 @@ Jonathan > + return 0; > +} > + -> static const struct i2c_device_id ad7746_id[] =3D { +> static const struct i2c_device_id ad7746_id[] = { > { "ad7745", 7745 }, > { "ad7746", 7746 }, -> @@ -792,6 +801,7 @@ static struct i2c_driver ad7746_driver =3D { -> .of_match_table =3D of_match_ptr(ad7746_of_match), +> @@ -792,6 +801,7 @@ static struct i2c_driver ad7746_driver = { +> .of_match_table = of_match_ptr(ad7746_of_match), > }, -> .probe =3D ad7746_probe, -> + .remove =3D ad7746_remove, -> .id_table =3D ad7746_id, +> .probe = ad7746_probe, +> + .remove = ad7746_remove, +> .id_table = ad7746_id, > }; > module_i2c_driver(ad7746_driver); diff --git a/a/content_digest b/N1/content_digest index 8bbd640..0583d47 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,27 +14,26 @@ "\00:1\0" "b\0" "On Wed, 21 Mar 2018 11:28:55 -0300\n" - "Hern=E1n Gonzalez <hernan@vanguardiasur.com.ar> wrote:\n" + "Hern\303\241n Gonzalez <hernan@vanguardiasur.com.ar> wrote:\n" "\n" "> This allows the driver to be probed and removed as a module.\n" - ">=20\n" - "> Signed-off-by: Hern=E1n Gonzalez <hernan@vanguardiasur.com.ar>\n" + "> \n" + "> Signed-off-by: Hern\303\241n Gonzalez <hernan@vanguardiasur.com.ar>\n" "> ---\n" "> drivers/staging/iio/cdc/ad7746.c | 10 ++++++++++\n" "> 1 file changed, 10 insertions(+)\n" - ">=20\n" - "> diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/a=\n" - "d7746.c\n" + "> \n" + "> diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c\n" "> index 815573c..8abba71 100644\n" "> --- a/drivers/staging/iio/cdc/ad7746.c\n" "> +++ b/drivers/staging/iio/cdc/ad7746.c\n" "> @@ -768,6 +768,15 @@ static int ad7746_probe(struct i2c_client *client,\n" "> \treturn 0;\n" "> }\n" - "> =20\n" + "> \n" "> +static int ad7746_remove(struct i2c_client *client)\n" "> +{\n" - "> +\tstruct iio_dev *indio_dev =3D i2c_get_clientdata(client);\n" + "> +\tstruct iio_dev *indio_dev = i2c_get_clientdata(client);\n" "> +\n" "> +\tiio_device_unregister(indio_dev);\n" "Remove is not required to allow a driver to be removed..\n" @@ -53,16 +52,16 @@ "> +\treturn 0;\n" "> +}\n" "> +\n" - "> static const struct i2c_device_id ad7746_id[] =3D {\n" + "> static const struct i2c_device_id ad7746_id[] = {\n" "> \t{ \"ad7745\", 7745 },\n" "> \t{ \"ad7746\", 7746 },\n" - "> @@ -792,6 +801,7 @@ static struct i2c_driver ad7746_driver =3D {\n" - "> \t\t.of_match_table =3D of_match_ptr(ad7746_of_match),\n" + "> @@ -792,6 +801,7 @@ static struct i2c_driver ad7746_driver = {\n" + "> \t\t.of_match_table = of_match_ptr(ad7746_of_match),\n" "> \t},\n" - "> \t.probe =3D ad7746_probe,\n" - "> +\t.remove =3D ad7746_remove,\n" - "> \t.id_table =3D ad7746_id,\n" + "> \t.probe = ad7746_probe,\n" + "> +\t.remove = ad7746_remove,\n" + "> \t.id_table = ad7746_id,\n" "> };\n" > module_i2c_driver(ad7746_driver); -fea5dac82ba387f358a8936dee06ae438d64fc755c1555f40eecdb4ebe4e6309 +0a8988e1f59da94e4080d2cf679d03115f46ebc71fa558c2b677a4662d4d7b7c
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.