2008-07-22 17:20:45

by Adrian Bunk

[permalink] [raw]
Subject: [2.6 patch] make ivtv_claim_stream() static

ivtv_claim_stream() can now become static.

Signed-off-by: Adrian Bunk <[email protected]>

---

drivers/media/video/ivtv/ivtv-fileops.c | 2 +-
drivers/media/video/ivtv/ivtv-fileops.h | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)

b37d68a97cbf9a53c753bb0d63a3b1e8380ea51c
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 7ec5c99..304261e 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -39,7 +39,7 @@
associated VBI streams are also automatically claimed.
Possible error returns: -EBUSY if someone else has claimed
the stream or 0 on success. */
-int ivtv_claim_stream(struct ivtv_open_id *id, int type)
+static int ivtv_claim_stream(struct ivtv_open_id *id, int type)
{
struct ivtv *itv = id->itv;
struct ivtv_stream *s = &itv->streams[type];
diff --git a/drivers/media/video/ivtv/ivtv-fileops.h b/drivers/media/video/ivtv/ivtv-fileops.h
index 2c8d518..df81e79 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.h
+++ b/drivers/media/video/ivtv/ivtv-fileops.h
@@ -38,11 +38,6 @@ void ivtv_unmute(struct ivtv *itv);

/* Utilities */

-/* Try to claim a stream for the filehandle. Return 0 on success,
- -EBUSY if stream already claimed. Once a stream is claimed, it
- remains claimed until the associated filehandle is closed. */
-int ivtv_claim_stream(struct ivtv_open_id *id, int type);
-
/* Release a previously claimed stream. */
void ivtv_release_stream(struct ivtv_stream *s);


2008-07-22 18:37:55

by Hans Verkuil

[permalink] [raw]
Subject: Re: [2.6 patch] make ivtv_claim_stream() static

On Tuesday 22 July 2008 19:20:12 Adrian Bunk wrote:
> ivtv_claim_stream() can now become static.
>
> Signed-off-by: Adrian Bunk <[email protected]>

Signed-off-by: Hans Verkuil <[email protected]>

Thanks,

Hans

>
> ---
>
> drivers/media/video/ivtv/ivtv-fileops.c | 2 +-
> drivers/media/video/ivtv/ivtv-fileops.h | 5 -----
> 2 files changed, 1 insertion(+), 6 deletions(-)
>
> b37d68a97cbf9a53c753bb0d63a3b1e8380ea51c
> diff --git a/drivers/media/video/ivtv/ivtv-fileops.c
> b/drivers/media/video/ivtv/ivtv-fileops.c index 7ec5c99..304261e
> 100644
> --- a/drivers/media/video/ivtv/ivtv-fileops.c
> +++ b/drivers/media/video/ivtv/ivtv-fileops.c
> @@ -39,7 +39,7 @@
> associated VBI streams are also automatically claimed.
> Possible error returns: -EBUSY if someone else has claimed
> the stream or 0 on success. */
> -int ivtv_claim_stream(struct ivtv_open_id *id, int type)
> +static int ivtv_claim_stream(struct ivtv_open_id *id, int type)
> {
> struct ivtv *itv = id->itv;
> struct ivtv_stream *s = &itv->streams[type];
> diff --git a/drivers/media/video/ivtv/ivtv-fileops.h
> b/drivers/media/video/ivtv/ivtv-fileops.h index 2c8d518..df81e79
> 100644
> --- a/drivers/media/video/ivtv/ivtv-fileops.h
> +++ b/drivers/media/video/ivtv/ivtv-fileops.h
> @@ -38,11 +38,6 @@ void ivtv_unmute(struct ivtv *itv);
>
> /* Utilities */
>
> -/* Try to claim a stream for the filehandle. Return 0 on success,
> - -EBUSY if stream already claimed. Once a stream is claimed, it
> - remains claimed until the associated filehandle is closed. */
> -int ivtv_claim_stream(struct ivtv_open_id *id, int type);
> -
> /* Release a previously claimed stream. */
> void ivtv_release_stream(struct ivtv_stream *s);
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe
> linux-kernel" in the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/