diff --git a/[refs] b/[refs] index cfc9261e2633..bf05cb0531c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82c3ccaa974345b42cabcdb19f81f4776156b1f7 +refs/heads/master: 1001f90865c2ccd1df7b3a86603c134528e23090 diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-417.c b/trunk/drivers/media/video/cx231xx/cx231xx-417.c index 2dbad82aab61..e456b97dc32e 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-417.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-417.c @@ -612,39 +612,6 @@ static int mc417_memory_read(struct cx231xx *dev, u32 address, u32 *value) return ret; } -static void mc417_gpio_set(struct cx231xx *dev, u32 mask) -{ - u32 val; - - /* Set the gpio value */ - mc417_register_read(dev, 0x900C, &val); - val |= (mask & 0x000ffff); - mc417_register_write(dev, 0x900C, val); -} - -static void mc417_gpio_clear(struct cx231xx *dev, u32 mask) -{ - u32 val; - - /* Clear the gpio value */ - mc417_register_read(dev, 0x900C, &val); - val &= ~(mask & 0x0000ffff); - mc417_register_write(dev, 0x900C, val); -} - -static void mc417_gpio_enable(struct cx231xx *dev, u32 mask, int asoutput) -{ - u32 val; - - /* Enable GPIO direction bits */ - mc417_register_read(dev, 0x9020, &val); - if (asoutput) - val |= (mask & 0x0000ffff); - else - val &= ~(mask & 0x0000ffff); - - mc417_register_write(dev, 0x9020, val); -} /* ------------------------------------------------------------------ */ /* MPEG encoder API */