diff for duplicates of <20130828141835.GD14111@linutronix.de> diff --git a/a/1.txt b/N1/1.txt index 2e480d0..7405351 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,25 +1,27 @@ * Zubair Lutfullah | 2013-08-25 23:45:24 [+0100]: ->diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c +>diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_a= +dc.c >index a952538..ae2202b 100644 >--- a/drivers/iio/adc/ti_am335x_adc.c >+++ b/drivers/iio/adc/ti_am335x_adc.c -… +=E2=80=A6 ->+static struct iio_trigger *tiadc_iio_allocate_trigger(struct iio_dev *indio_dev) +>+static struct iio_trigger *tiadc_iio_allocate_trigger(struct iio_dev *ind= +io_dev) >+{ >+ struct iio_trigger *trig; >+ int ret; >+ ->+ trig = iio_trigger_alloc("%s-dev%d", indio_dev->name, indio_dev->id); ->+ if (trig == NULL) +>+ trig =3D iio_trigger_alloc("%s-dev%d", indio_dev->name, indio_dev->id); +>+ if (trig =3D=3D NULL) >+ return NULL; >+ ->+ trig->dev.parent = indio_dev->dev.parent; ->+ trig->ops = &tiadc_trigger_ops; +>+ trig->dev.parent =3D indio_dev->dev.parent; +>+ trig->ops =3D &tiadc_trigger_ops; >+ iio_trigger_set_drvdata(trig, indio_dev); >+ ->+ ret = iio_trigger_register(trig); +>+ ret =3D iio_trigger_register(trig); >+ if (ret) shouldn't you free the trigger / undo iio_trigger_alloc() here? @@ -29,24 +31,24 @@ shouldn't you free the trigger / undo iio_trigger_alloc() here? >+ return trig; > } -> -> static const char * const chan_name_ain[] = { +>=20 +> static const char * const chan_name_ain[] =3D { >@@ -220,7 +394,8 @@ static int tiadc_probe(struct platform_device *pdev) > sizeof(struct tiadc_device)); -> if (indio_dev == NULL) { +> if (indio_dev =3D=3D NULL) { > dev_err(&pdev->dev, "failed to allocate iio device\n"); >- return -ENOMEM; ->+ err = -ENOMEM; +>+ err =3D -ENOMEM; >+ goto err_ret; Why the jump instead of leave right away? > } -> adc_dev = iio_priv(indio_dev); -> +> adc_dev =3D iio_priv(indio_dev); +>=20 >@@ -262,11 +465,14 @@ static int tiadc_remove(struct platform_device *pdev) -> struct tiadc_device *adc_dev = iio_priv(indio_dev); +> struct tiadc_device *adc_dev =3D iio_priv(indio_dev); > u32 step_en; -> +>=20 >+ free_irq(adc_dev->irq, indio_dev); > iio_device_unregister(indio_dev); >+ iio_buffer_unregister(indio_dev); @@ -58,11 +60,11 @@ I think you need also to iio_trigger_free(adc_dev->trig); here. - -> step_en = get_adc_step_mask(adc_dev); +=20 +> step_en =3D get_adc_step_mask(adc_dev); > am335x_tsc_se_clr(adc_dev->mfd_tscadc, step_en); >+ iio_device_free(indio_dev); -> +>=20 > return 0; > } diff --git a/a/content_digest b/N1/content_digest index 25e8eb4..667462f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,40 +1,41 @@ "ref\01377470724-15710-1-git-send-email-zubair.lutfullah@gmail.com\0" "ref\01377470724-15710-3-git-send-email-zubair.lutfullah@gmail.com\0" - "ref\01377470724-15710-3-git-send-email-zubair.lutfullah-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" - "From\0Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>\0" + "From\0Sebastian Andrzej Siewior <bigeasy@linutronix.de>\0" "Subject\0Re: [PATCH 2/2] iio: ti_am335x_adc: Add continuous sampling support\0" "Date\0Wed, 28 Aug 2013 16:18:35 +0200\0" - "To\0Zubair Lutfullah <zubair.lutfullah-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Cc\0jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org" - lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org - linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org\0" + "To\0Zubair Lutfullah <zubair.lutfullah@gmail.com>\0" + "Cc\0jic23@cam.ac.uk" + lee.jones@linaro.org + linux-iio@vger.kernel.org + linux-input@vger.kernel.org + linux-kernel@vger.kernel.org + " gregkh@linuxfoundation.org\0" "\00:1\0" "b\0" "* Zubair Lutfullah | 2013-08-25 23:45:24 [+0100]:\n" "\n" - ">diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c\n" + ">diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_a=\n" + "dc.c\n" ">index a952538..ae2202b 100644\n" ">--- a/drivers/iio/adc/ti_am335x_adc.c\n" ">+++ b/drivers/iio/adc/ti_am335x_adc.c\n" - "\342\200\246\n" + "=E2=80=A6\n" "\n" - ">+static struct iio_trigger *tiadc_iio_allocate_trigger(struct iio_dev *indio_dev)\n" + ">+static struct iio_trigger *tiadc_iio_allocate_trigger(struct iio_dev *ind=\n" + "io_dev)\n" ">+{\n" ">+\tstruct iio_trigger *trig;\n" ">+\tint ret;\n" ">+\n" - ">+\ttrig = iio_trigger_alloc(\"%s-dev%d\", indio_dev->name, indio_dev->id);\n" - ">+\tif (trig == NULL)\n" + ">+\ttrig =3D iio_trigger_alloc(\"%s-dev%d\", indio_dev->name, indio_dev->id);\n" + ">+\tif (trig =3D=3D NULL)\n" ">+\t\treturn NULL;\n" ">+\n" - ">+\ttrig->dev.parent = indio_dev->dev.parent;\n" - ">+\ttrig->ops = &tiadc_trigger_ops;\n" + ">+\ttrig->dev.parent =3D indio_dev->dev.parent;\n" + ">+\ttrig->ops =3D &tiadc_trigger_ops;\n" ">+\tiio_trigger_set_drvdata(trig, indio_dev);\n" ">+\n" - ">+\tret = iio_trigger_register(trig);\n" + ">+\tret =3D iio_trigger_register(trig);\n" ">+\tif (ret)\n" "\n" "shouldn't you free the trigger / undo iio_trigger_alloc() here?\n" @@ -44,24 +45,24 @@ ">+\treturn trig;\n" "> }\n" "\n" - "> \n" - "> static const char * const chan_name_ain[] = {\n" + ">=20\n" + "> static const char * const chan_name_ain[] =3D {\n" ">@@ -220,7 +394,8 @@ static int tiadc_probe(struct platform_device *pdev)\n" "> \t\t\t\t\t sizeof(struct tiadc_device));\n" - "> \tif (indio_dev == NULL) {\n" + "> \tif (indio_dev =3D=3D NULL) {\n" "> \t\tdev_err(&pdev->dev, \"failed to allocate iio device\\n\");\n" ">-\t\treturn -ENOMEM;\n" - ">+\t\terr = -ENOMEM;\n" + ">+\t\terr =3D -ENOMEM;\n" ">+\t\tgoto err_ret;\n" "Why the jump instead of leave right away?\n" "\n" "> \t}\n" - "> \tadc_dev = iio_priv(indio_dev);\n" - "> \n" + "> \tadc_dev =3D iio_priv(indio_dev);\n" + ">=20\n" ">@@ -262,11 +465,14 @@ static int tiadc_remove(struct platform_device *pdev)\n" - "> \tstruct tiadc_device *adc_dev = iio_priv(indio_dev);\n" + "> \tstruct tiadc_device *adc_dev =3D iio_priv(indio_dev);\n" "> \tu32 step_en;\n" - "> \n" + ">=20\n" ">+\tfree_irq(adc_dev->irq, indio_dev);\n" "> \tiio_device_unregister(indio_dev);\n" ">+\tiio_buffer_unregister(indio_dev);\n" @@ -73,14 +74,14 @@ "\tiio_trigger_free(adc_dev->trig);\n" "\n" "here.\n" - " \n" - "> \tstep_en = get_adc_step_mask(adc_dev);\n" + "=20\n" + "> \tstep_en =3D get_adc_step_mask(adc_dev);\n" "> \tam335x_tsc_se_clr(adc_dev->mfd_tscadc, step_en);\n" ">+\tiio_device_free(indio_dev);\n" - "> \n" + ">=20\n" "> \treturn 0;\n" "> }\n" "\n" Sebastian -cecfe6b54e108c930df414f3658d63364bc6714b7c7e0ce78787cf894ddabc73 +b186db3f6d273ff1f7e1047711ab7997db37d20317866eba1fab04c90503ce0e
diff --git a/a/content_digest b/N2/content_digest index 25e8eb4..9f30b1a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,15 @@ "ref\01377470724-15710-1-git-send-email-zubair.lutfullah@gmail.com\0" "ref\01377470724-15710-3-git-send-email-zubair.lutfullah@gmail.com\0" - "ref\01377470724-15710-3-git-send-email-zubair.lutfullah-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" - "From\0Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>\0" + "From\0Sebastian Andrzej Siewior <bigeasy@linutronix.de>\0" "Subject\0Re: [PATCH 2/2] iio: ti_am335x_adc: Add continuous sampling support\0" "Date\0Wed, 28 Aug 2013 16:18:35 +0200\0" - "To\0Zubair Lutfullah <zubair.lutfullah-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Cc\0jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org" - lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org - linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org\0" + "To\0Zubair Lutfullah <zubair.lutfullah@gmail.com>\0" + "Cc\0jic23@cam.ac.uk" + lee.jones@linaro.org + linux-iio@vger.kernel.org + linux-input@vger.kernel.org + linux-kernel@vger.kernel.org + " gregkh@linuxfoundation.org\0" "\00:1\0" "b\0" "* Zubair Lutfullah | 2013-08-25 23:45:24 [+0100]:\n" @@ -83,4 +82,4 @@ "\n" Sebastian -cecfe6b54e108c930df414f3658d63364bc6714b7c7e0ce78787cf894ddabc73 +af576bb80d1e049041b03656f7cc02ba73c59ad590aeb0088b5fcacbf072cd60
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.