public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[media] go7007: update the README, fix checkpatch warnings

Browse source 
This prepares the driver for moving out of staging.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Hans Verkuil 2014-07-17 20:40:20 -03:00 • committed by Mauro Carvalho Chehab
parent 5cbf17f505
commit 9707cb55c9
11 changed files with 18 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/media/go7007/README
View file

@ -1,5 +1,4 @@
Todo: Todo:
- create an API for motion detection
- let s2250-board use i2c subdevs as well instead of hardcoding - let s2250-board use i2c subdevs as well instead of hardcoding
support for the i2c devices. support for the i2c devices.
- when the driver is moved out of staging, support for saa7134-go7007 - when the driver is moved out of staging, support for saa7134-go7007

6
drivers/staging/media/go7007/go7007-driver.c
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#include <linux/module.h> #include <linux/module.h>
@ -225,7 +221,7 @@ static int init_i2c_module(struct i2c_adapter *adapter, const struct go_i2c *con
return 0; return 0;
} }
printk(KERN_INFO "go7007: probing for module i2c:%s failed\n", i2c->type); pr_info("go7007: probing for module i2c:%s failed\n", i2c->type);
return -EINVAL; return -EINVAL;
} }

4
drivers/staging/media/go7007/go7007-fw.c
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
/* /*

4
drivers/staging/media/go7007/go7007-i2c.c
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#include <linux/module.h> #include <linux/module.h>

4
drivers/staging/media/go7007/go7007-loader.c
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#include <linux/module.h> #include <linux/module.h>

4
drivers/staging/media/go7007/go7007-priv.h
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
/* /*

4
drivers/staging/media/go7007/go7007-usb.c
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

4
drivers/staging/media/go7007/go7007-v4l2.c
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#include <linux/module.h> #include <linux/module.h>

9
drivers/staging/media/go7007/s2250-board.c
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#include <linux/module.h> #include <linux/module.h>
@ -573,11 +569,12 @@ static int s2250_probe(struct i2c_client *client,
if (mutex_lock_interruptible(&usb->i2c_lock) == 0) { if (mutex_lock_interruptible(&usb->i2c_lock) == 0) {
data = kzalloc(16, GFP_KERNEL); data = kzalloc(16, GFP_KERNEL);
if (data != NULL) { if (data != NULL) {
int rc; int rc = go7007_usb_vendor_request(go, 0x41, 0, 0,
rc = go7007_usb_vendor_request(go, 0x41, 0, 0,
data, 16, 1); data, 16, 1);
if (rc > 0) { if (rc > 0) {
u8 mask; u8 mask;
data[0] = 0; data[0] = 0;
mask = 1<<5; mask = 1<<5;
data[0] &= ~mask; data[0] &= ~mask;

34
drivers/staging/media/go7007/saa7134-go7007.c
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#include <linux/module.h> #include <linux/module.h>
@ -167,7 +163,7 @@ static int saa7134_go7007_interface_reset(struct go7007 *go)
saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN); saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
status = saa_readb(SAA7134_GPIO_GPSTATUS2); status = saa_readb(SAA7134_GPIO_GPSTATUS2);
/*printk(KERN_DEBUG "status is %s\n", status & 0x40 ? "OK" : "not OK"); */ /*pr_debug("status is %s\n", status & 0x40 ? "OK" : "not OK"); */
/* enter command mode...(?) */ /* enter command mode...(?) */
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ1); saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ1);
@ -177,14 +173,13 @@ static int saa7134_go7007_interface_reset(struct go7007 *go)
saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN); saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN); saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
status = saa_readb(SAA7134_GPIO_GPSTATUS2); status = saa_readb(SAA7134_GPIO_GPSTATUS2);
/*printk(KERN_INFO "gpio is %08x\n", saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2)); */ /*pr_info("gpio is %08x\n", saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2)); */
} while (--count > 0); } while (--count > 0);
/* Wait for an interrupt to indicate successful hardware reset */ /* Wait for an interrupt to indicate successful hardware reset */
if (go7007_read_interrupt(go, &intr_val, &intr_data) < 0 || if (go7007_read_interrupt(go, &intr_val, &intr_data) < 0 ||
(intr_val & ~0x1) != 0x55aa) { (intr_val & ~0x1) != 0x55aa) {
printk(KERN_ERR pr_err("saa7134-go7007: unable to reset the GO7007\n");
"saa7134-go7007: unable to reset the GO7007\n");
return -1; return -1;
} }
return 0; return 0;
@ -198,8 +193,7 @@ static int saa7134_go7007_write_interrupt(struct go7007 *go, int addr, int data)
u16 status_reg; u16 status_reg;
#ifdef GO7007_HPI_DEBUG #ifdef GO7007_HPI_DEBUG
printk(KERN_DEBUG pr_debug("saa7134-go7007: WriteInterrupt: %04x %04x\n", addr, data);
"saa7134-go7007: WriteInterrupt: %04x %04x\n", addr, data);
#endif #endif
for (i = 0; i < 100; ++i) { for (i = 0; i < 100; ++i) {
@ -209,8 +203,7 @@ static int saa7134_go7007_write_interrupt(struct go7007 *go, int addr, int data)
msleep(10); msleep(10);
} }
if (i == 100) { if (i == 100) {
printk(KERN_ERR pr_err("saa7134-go7007: device is hung, status reg = 0x%04x\n",
"saa7134-go7007: device is hung, status reg = 0x%04x\n",
status_reg); status_reg);
return -1; return -1;
} }
@ -230,7 +223,7 @@ static int saa7134_go7007_read_interrupt(struct go7007 *go)
gpio_read(dev, HPI_ADDR_INTR_RET_VALUE, &go->interrupt_value); gpio_read(dev, HPI_ADDR_INTR_RET_VALUE, &go->interrupt_value);
gpio_read(dev, HPI_ADDR_INTR_RET_DATA, &go->interrupt_data); gpio_read(dev, HPI_ADDR_INTR_RET_DATA, &go->interrupt_data);
#ifdef GO7007_HPI_DEBUG #ifdef GO7007_HPI_DEBUG
printk(KERN_DEBUG "saa7134-go7007: ReadInterrupt: %04x %04x\n", pr_debug("saa7134-go7007: ReadInterrupt: %04x %04x\n",
go->interrupt_value, go->interrupt_data); go->interrupt_value, go->interrupt_data);
#endif #endif
return 0; return 0;
@ -245,7 +238,7 @@ static void saa7134_go7007_irq_ts_done(struct saa7134_dev *dev,
if (!vb2_is_streaming(&go->vidq)) if (!vb2_is_streaming(&go->vidq))
return; return;
if (0 != (status & 0x000f0000)) if (0 != (status & 0x000f0000))
printk(KERN_DEBUG "saa7134-go7007: irq: lost %ld\n", pr_debug("saa7134-go7007: irq: lost %ld\n",
(status >> 16) & 0x0f); (status >> 16) & 0x0f);
if (status & 0x100000) { if (status & 0x100000) {
dma_sync_single_for_cpu(&dev->pci->dev, dma_sync_single_for_cpu(&dev->pci->dev,
@ -355,8 +348,7 @@ static int saa7134_go7007_send_firmware(struct go7007 *go, u8 *data, int len)
int i; int i;
#ifdef GO7007_HPI_DEBUG #ifdef GO7007_HPI_DEBUG
printk(KERN_DEBUG "saa7134-go7007: DownloadBuffer " pr_debug("saa7134-go7007: DownloadBuffer sending %d bytes\n", len);
"sending %d bytes\n", len);
#endif #endif
while (len > 0) { while (len > 0) {
@ -378,8 +370,8 @@ static int saa7134_go7007_send_firmware(struct go7007 *go, u8 *data, int len)
break; break;
} }
if (i == 100) { if (i == 100) {
printk(KERN_ERR "saa7134-go7007: device is hung, " pr_err("saa7134-go7007: device is hung, status reg = 0x%04x\n",
"status reg = 0x%04x\n", status_reg); status_reg);
return -1; return -1;
} }
} }
@ -416,6 +408,7 @@ static int saa7134_go7007_s_ctrl(struct v4l2_subdev *sd,
{ {
struct saa7134_go7007 *saa = to_state(sd); struct saa7134_go7007 *saa = to_state(sd);
struct saa7134_dev *dev = saa->dev; struct saa7134_dev *dev = saa->dev;
return saa7134_s_ctrl_internal(dev, NULL, ctrl); return saa7134_s_ctrl_internal(dev, NULL, ctrl);
} }
@ -424,6 +417,7 @@ static int saa7134_go7007_g_ctrl(struct v4l2_subdev *sd,
{ {
struct saa7134_go7007 *saa = to_state(sd); struct saa7134_go7007 *saa = to_state(sd);
struct saa7134_dev *dev = saa->dev; struct saa7134_dev *dev = saa->dev;
return saa7134_g_ctrl_internal(dev, NULL, ctrl); return saa7134_g_ctrl_internal(dev, NULL, ctrl);
} }
@ -455,7 +449,7 @@ static int saa7134_go7007_init(struct saa7134_dev *dev)
struct saa7134_go7007 *saa; struct saa7134_go7007 *saa;
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
printk(KERN_DEBUG "saa7134-go7007: probing new SAA713X board\n"); pr_debug("saa7134-go7007: probing new SAA713X board\n");
go = go7007_alloc(&board_voyager, &dev->pci->dev); go = go7007_alloc(&board_voyager, &dev->pci->dev);
if (go == NULL) if (go == NULL)
@ -500,7 +494,7 @@ static int saa7134_go7007_init(struct saa7134_dev *dev)
/* Register the subdevice interface with the go7007 device */ /* Register the subdevice interface with the go7007 device */
if (v4l2_device_register_subdev(&go->v4l2_dev, sd) < 0) if (v4l2_device_register_subdev(&go->v4l2_dev, sd) < 0)
printk(KERN_INFO "saa7134-go7007: register subdev failed\n"); pr_info("saa7134-go7007: register subdev failed\n");
dev->empress_dev = &go->vdev; dev->empress_dev = &go->vdev;

4
drivers/staging/media/go7007/snd-go7007.c
View file

@ -9,10 +9,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>