aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/gspca/pac7302.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-29 05:59:42 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 07:45:00 -0400
commitb1c85cc049a681aee805311faa56fd21b44fb904 (patch)
tree9023aa62d5d710290f8635bbadbe7fcd2ff2713d /drivers/media/usb/gspca/pac7302.c
parent23898919c45ff5fc5d882ec6206b38a5fb6ecd88 (diff)
[media] gspca: remove g_chip_ident
Remove g_chip_ident and replace it with g_chip_info. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/gspca/pac7302.c')
-rw-r--r--drivers/media/usb/gspca/pac7302.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/media/usb/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c
index 6008c8d546a3..a91509643563 100644
--- a/drivers/media/usb/gspca/pac7302.c
+++ b/drivers/media/usb/gspca/pac7302.c
@@ -93,7 +93,6 @@
93#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 93#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
94 94
95#include <linux/input.h> 95#include <linux/input.h>
96#include <media/v4l2-chip-ident.h>
97#include "gspca.h" 96#include "gspca.h"
98/* Include pac common sof detection functions */ 97/* Include pac common sof detection functions */
99#include "pac_common.h" 98#include "pac_common.h"
@@ -849,8 +848,7 @@ static int sd_dbg_s_register(struct gspca_dev *gspca_dev,
849 * reg->reg: bit0..15: reserved for register index (wIndex is 16bit 848 * reg->reg: bit0..15: reserved for register index (wIndex is 16bit
850 * long on the USB bus) 849 * long on the USB bus)
851 */ 850 */
852 if (reg->match.type == V4L2_CHIP_MATCH_HOST && 851 if (reg->match.addr == 0 &&
853 reg->match.addr == 0 &&
854 (reg->reg < 0x000000ff) && 852 (reg->reg < 0x000000ff) &&
855 (reg->val <= 0x000000ff) 853 (reg->val <= 0x000000ff)
856 ) { 854 ) {
@@ -871,20 +869,6 @@ static int sd_dbg_s_register(struct gspca_dev *gspca_dev,
871 } 869 }
872 return gspca_dev->usb_err; 870 return gspca_dev->usb_err;
873} 871}
874
875static int sd_chip_ident(struct gspca_dev *gspca_dev,
876 struct v4l2_dbg_chip_ident *chip)
877{
878 int ret = -EINVAL;
879
880 if (chip->match.type == V4L2_CHIP_MATCH_HOST &&
881 chip->match.addr == 0) {
882 chip->revision = 0;
883 chip->ident = V4L2_IDENT_UNKNOWN;
884 ret = 0;
885 }
886 return ret;
887}
888#endif 872#endif
889 873
890#if IS_ENABLED(CONFIG_INPUT) 874#if IS_ENABLED(CONFIG_INPUT)
@@ -931,7 +915,6 @@ static const struct sd_desc sd_desc = {
931 .dq_callback = do_autogain, 915 .dq_callback = do_autogain,
932#ifdef CONFIG_VIDEO_ADV_DEBUG 916#ifdef CONFIG_VIDEO_ADV_DEBUG
933 .set_register = sd_dbg_s_register, 917 .set_register = sd_dbg_s_register,
934 .get_chip_ident = sd_chip_ident,
935#endif 918#endif
936#if IS_ENABLED(CONFIG_INPUT) 919#if IS_ENABLED(CONFIG_INPUT)
937 .int_pkt_scan = sd_int_pkt_scan, 920 .int_pkt_scan = sd_int_pkt_scan,