Remove some obsolete drivers for 2.6.35

PATCH In review Amerigo Wang 2 participants 9 messages May 28, 2010 – May 31, 2010

Subsystems (2)

Documentation Media (V4L/DVB)

lore

Share & tools

lore

Amerigo Wang

author

2010-05-28 17:02 UTC #0 lore raw

cover Remove some obsolete drivers for 2.6.35

This series of patch removes some obsolete drivers for 2.6.35.
They are scheduled to be removed at this time in Documentation/feature-removal-schedule.txt.

Thanks!

Amerigo Wang

author

2010-05-28 17:02 UTC #1 lore raw

PATCH 1/6 Remove usbvideo quickcam_messenger driver

From: Amerigo Wang <[email protected]>
Date: Fri, 28 May 2010 17:26:32 +0800
Subject: [PATCH 1/6] Remove usbvideo quickcam_messenger driver

obsolete v4l1 driver replaced by gspca_stv06xx

Cc Hans de Goede <[email protected]>

Signed-off-by Amerigo Wang <[email protected]>

---
 Documentation/feature-removal-schedule.txt        |    8 -
 drivers/media/video/usbvideo/Kconfig              |   14 -
 drivers/media/video/usbvideo/Makefile             |    1 -
 drivers/media/video/usbvideo/quickcam_messenger.c | 1126 ---------------------
 drivers/media/video/usbvideo/quickcam_messenger.h |  112 --
 5 files changed, 0 insertions(+), 1261 deletions(-)
 delete mode 100644 drivers/media/video/usbvideo/quickcam_messenger.c
 delete mode 100644 drivers/media/video/usbvideo/quickcam_messenger.h

Documentation/feature-removal-schedule.txt +0 -8

index a86152a..0d75cd9 100644
@@ -459,14 +459,6 @@ Who:	Corentin Chary <[email protected]>
 
 ----------------------------
 
-What:	usbvideo quickcam_messenger driver
-When:	2.6.35
-Files:	drivers/media/video/usbvideo/quickcam_messenger.[ch]
-Why:	obsolete v4l1 driver replaced by gspca_stv06xx
-Who:	Hans de Goede <[email protected]>
-
-----------------------------
-
 What:	ov511 v4l1 driver
 When:	2.6.35
 Files:	drivers/media/video/ov511.[ch]

drivers/media/video/usbvideo/Kconfig +0 ~~-14~~

index adb1c04..d6e1695 100644
@@ -37,17 +37,3 @@ config USB_KONICAWC
 	  To compile this driver as a module, choose M here: the
 	  module will be called konicawc.
 
-config USB_QUICKCAM_MESSENGER
-	tristate "USB Logitech Quickcam Messenger (DEPRECATED)"
-	depends on VIDEO_V4L1
-	select VIDEO_USBVIDEO
-	---help---
-	  This driver is DEPRECATED please use the gspca stv06xx module
-	  instead.
-
-	  Say Y or M here to enable support for the USB Logitech Quickcam
-	  Messenger webcam.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called quickcam_messenger.
-

drivers/media/video/usbvideo/Makefile +0 -1

index 4a1b144..bb52eb8 100644
@@ -2,4 +2,3 @@ obj-$(CONFIG_VIDEO_USBVIDEO)    += usbvideo.o
 obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o ultracam.o
 obj-$(CONFIG_USB_KONICAWC)      += konicawc.o
 obj-$(CONFIG_USB_VICAM)         += vicam.o
-obj-$(CONFIG_USB_QUICKCAM_MESSENGER)	+= quickcam_messenger.o

drivers/media/video/usbvideo/quickcam_messenger.c deleted +0 ~~-1126~~

1,126 lines not on this page · raw message

drivers/media/video/usbvideo/quickcam_messenger.h deleted +0 ~~-112~~

112 lines not on this page · raw message

Signature · 1 line

1.6.5.2

Amerigo Wang

author

2010-05-28 17:02 UTC #2 lore raw

PATCH 2/6 Remove obsolete ov511 driver

In reply to Amerigo Wang

From: Amerigo Wang <[email protected]>
Date: Fri, 28 May 2010 17:31:39 +0800
Subject: [PATCH 2/6] Remove obsolete ov511 driver

obsolete v4l1 driver replaced by gspca_ov519

Cc Hans de Goede <[email protected]>

Signed-off-by Amerigo Wang <[email protected]>

---

 Documentation/feature-removal-schedule.txt |    8 -
 drivers/media/video/Kconfig                |   16 -
 drivers/media/video/Makefile               |    1 -
 drivers/media/video/ov511.c                | 5995 ----------------------------
 drivers/media/video/ov511.h                |  573 ---
 5 files changed, 0 insertions(+), 6593 deletions(-)
 delete mode 100644 drivers/media/video/ov511.c
 delete mode 100644 drivers/media/video/ov511.h

Documentation/feature-removal-schedule.txt +0 -8

index 0d75cd9..044c4bc 100644
@@ -459,14 +459,6 @@ Who:	Corentin Chary <[email protected]>
 
 ----------------------------
 
-What:	ov511 v4l1 driver
-When:	2.6.35
-Files:	drivers/media/video/ov511.[ch]
-Why:	obsolete v4l1 driver replaced by gspca_ov519
-Who:	Hans de Goede <[email protected]>
-
-----------------------------
-
 What:	w9968cf v4l1 driver
 When:	2.6.35
 Files:	drivers/media/video/w9968cf*.[ch]

drivers/media/video/Kconfig +0 ~~-16~~

index ad9e6f9..2b82ab6 100644
@@ -1039,22 +1039,6 @@ config USB_W9968CF
 	  To compile this driver as a module, choose M here: the
 	  module will be called w9968cf.
 
-config USB_OV511
-	tristate "USB OV511 Camera support (DEPRECATED)"
-	depends on VIDEO_V4L1
-	default n
-	---help---
-	  This driver is DEPRECATED please use the gspca ov519 module
-	  instead. Note that for the ov511 / ov518 support of the gspca module
-	  you need atleast version 0.6.0 of libv4l.
-
-	  Say Y here if you want to connect this type of camera to your
-	  computer's USB port. See <file:Documentation/video4linux/ov511.txt>
-	  for more information and for a list of supported cameras.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called ov511.
-
 config USB_SE401
 	tristate "USB SE401 Camera support"
 	depends on VIDEO_V4L1

drivers/media/video/Makefile +0 -1

index cc93859..82aef40 100644
@@ -127,7 +127,6 @@ obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
 obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
 
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o
-obj-$(CONFIG_USB_OV511)         += ov511.o
 obj-$(CONFIG_USB_SE401)         += se401.o
 obj-$(CONFIG_USB_STV680)        += stv680.o
 obj-$(CONFIG_USB_W9968CF)       += w9968cf.o

drivers/media/video/ov511.c deleted +0 ~~-5995~~

2,957 lines not on this page · raw message

drivers/media/video/ov511.h deleted +0 ~~-573~~

573 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line

1.6.5.2

Part of the diff is not shown here. View the raw message.

Amerigo Wang

author

2010-05-28 17:02 UTC #3 lore raw

PATCH 3/6 Remove obsolete w9968cf v4l1 driver

In reply to Amerigo Wang

Quoted 1 line

From a97df96226e89d3539be93ddb5a8df3a2f7edcb6 Mon Sep 17 00:00:00 2001

From: Amerigo Wang <[email protected]>
Date: Fri, 28 May 2010 17:41:07 +0800
Subject: [PATCH 3/6] Remove obsolete w9968cf v4l1 driver

obsolete v4l1 driver replaced by gspca_ov519

Cc Hans de Goede <[email protected]>

Signed-off-by Amerigo Wang <[email protected]>

---

 Documentation/feature-removal-schedule.txt |    8 -
 drivers/media/video/Kconfig                |   22 -
 drivers/media/video/Makefile               |    1 -
 drivers/media/video/w9968cf.c              | 3620 ----------------------------
 drivers/media/video/w9968cf.h              |  333 ---
 drivers/media/video/w9968cf_decoder.h      |   86 -
 drivers/media/video/w9968cf_vpp.h          |   40 -
 7 files changed, 0 insertions(+), 4110 deletions(-)
 delete mode 100644 drivers/media/video/w9968cf.c
 delete mode 100644 drivers/media/video/w9968cf.h
 delete mode 100644 drivers/media/video/w9968cf_decoder.h
 delete mode 100644 drivers/media/video/w9968cf_vpp.h

Documentation/feature-removal-schedule.txt +0 -8

index 044c4bc..e2d630c 100644
@@ -459,14 +459,6 @@ Who:	Corentin Chary <[email protected]>
 
 ----------------------------
 
-What:	w9968cf v4l1 driver
-When:	2.6.35
-Files:	drivers/media/video/w9968cf*.[ch]
-Why:	obsolete v4l1 driver replaced by gspca_ov519
-Who:	Hans de Goede <[email protected]>
-
-----------------------------
-
 What:	ovcamchip sensor framework
 When:	2.6.35
 Files:	drivers/media/video/ovcamchip/*

drivers/media/video/Kconfig +0 ~~-22~~

index 2b82ab6..a546444 100644
@@ -1017,28 +1017,6 @@ config VIDEO_OVCAMCHIP
 	  To compile this driver as a module, choose M here: the
 	  module will be called ovcamchip.
 
-config USB_W9968CF
-	tristate "USB W996[87]CF JPEG Dual Mode Camera support (DEPRECATED)"
-	depends on VIDEO_V4L1 && I2C && VIDEO_OVCAMCHIP
-	default n
-	---help---
-	  This driver is DEPRECATED please use the gspca ov519 module
-	  instead. Note that for the w9968cf support of the gspca module
-	  you need atleast version 0.6.3 of libv4l.
-
-	  Say Y here if you want support for cameras based on OV681 or
-	  Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
-
-	  This driver has an optional plugin, which is distributed as a
-	  separate module only (released under GPL). It allows to use higher
-	  resolutions and framerates, but cannot be included in the official
-	  Linux kernel for performance purposes.
-
-	  See <file:Documentation/video4linux/w9968cf.txt> for more info.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called w9968cf.
-
 config USB_SE401
 	tristate "USB SE401 Camera support"
 	depends on VIDEO_V4L1

drivers/media/video/Makefile +0 -1

index 82aef40..bb702c9 100644
@@ -129,7 +129,6 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o
 obj-$(CONFIG_USB_SE401)         += se401.o
 obj-$(CONFIG_USB_STV680)        += stv680.o
-obj-$(CONFIG_USB_W9968CF)       += w9968cf.o
 obj-$(CONFIG_USB_ZR364XX)       += zr364xx.o
 obj-$(CONFIG_USB_STKWEBCAM)     += stkwebcam.o

drivers/media/video/w9968cf.c deleted +0 ~~-3620~~

2,951 lines not on this page · raw message

drivers/media/video/w9968cf.h deleted +0 ~~-333~~

333 lines not on this page · raw message

drivers/media/video/w9968cf_decoder.h deleted +0 ~~-86~~

86 lines not on this page · raw message

drivers/media/video/w9968cf_vpp.h deleted +0 ~~-40~~

deleted file mode 100644
index 88c9b6c..0000000

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line

1.6.5.2

Part of the diff is not shown here. View the raw message.

Amerigo Wang

author

2010-05-28 17:03 UTC #4 lore raw

PATCH 4/6 Remove obsolete ovcamchip sensor framework

In reply to Amerigo Wang

From: Amerigo Wang <[email protected]>
Date: Fri, 28 May 2010 17:45:38 +0800
Subject: [PATCH 4/6] Remove obsolete ovcamchip sensor framework

Only used by obsoleted v4l1 driver

Cc Hans de Goede <[email protected]>

Signed-off-by Amerigo Wang <[email protected]>

---
 Documentation/feature-removal-schedule.txt     |    8 -
 drivers/media/video/Kconfig                    |   17 -
 drivers/media/video/Makefile                   |    1 -
 drivers/media/video/ovcamchip/Makefile         |    4 -
 drivers/media/video/ovcamchip/ov6x20.c         |  414 ---------------------
 drivers/media/video/ovcamchip/ov6x30.c         |  373 -------------------
 drivers/media/video/ovcamchip/ov76be.c         |  302 ----------------
 drivers/media/video/ovcamchip/ov7x10.c         |  334 -----------------
 drivers/media/video/ovcamchip/ov7x20.c         |  454 ------------------------
 drivers/media/video/ovcamchip/ovcamchip_core.c |  395 ---------------------
 drivers/media/video/ovcamchip/ovcamchip_priv.h |  101 ------
 11 files changed, 0 insertions(+), 2403 deletions(-)
 delete mode 100644 drivers/media/video/ovcamchip/Makefile
 delete mode 100644 drivers/media/video/ovcamchip/ov6x20.c
 delete mode 100644 drivers/media/video/ovcamchip/ov6x30.c
 delete mode 100644 drivers/media/video/ovcamchip/ov76be.c
 delete mode 100644 drivers/media/video/ovcamchip/ov7x10.c
 delete mode 100644 drivers/media/video/ovcamchip/ov7x20.c
 delete mode 100644 drivers/media/video/ovcamchip/ovcamchip_core.c
 delete mode 100644 drivers/media/video/ovcamchip/ovcamchip_priv.h

Documentation/feature-removal-schedule.txt +0 -8

index e2d630c..42bb6e6 100644
@@ -459,14 +459,6 @@ Who:	Corentin Chary <[email protected]>
 
 ----------------------------
 
-What:	ovcamchip sensor framework
-When:	2.6.35
-Files:	drivers/media/video/ovcamchip/*
-Why:	Only used by obsoleted v4l1 drivers
-Who:	Hans de Goede <[email protected]>
-
-----------------------------
-
 What:	stv680 v4l1 driver
 When:	2.6.35
 Files:	drivers/media/video/stv680.[ch]

drivers/media/video/Kconfig +0 ~~-17~~

index a546444..de12f93 100644
@@ -1000,23 +1000,6 @@ source "drivers/media/video/usbvideo/Kconfig"
 
 source "drivers/media/video/et61x251/Kconfig"
 
-config VIDEO_OVCAMCHIP
-	tristate "OmniVision Camera Chip support (DEPRECATED)"
-	depends on I2C && VIDEO_V4L1
-	default n
-	---help---
-	  This driver is DEPRECATED please use the gspca ov519 module
-	  instead. Note that for the ov511 / ov518 support of the gspca module
-	  you need atleast version 0.6.0 of libv4l and for the w9968cf
-	  atleast version 0.6.3 of libv4l.
-
-	  Support for the OmniVision OV6xxx and OV7xxx series of camera chips.
-	  This driver is intended to be used with the ov511 and w9968cf USB
-	  camera drivers.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called ovcamchip.
-
 config USB_SE401
 	tristate "USB SE401 Camera support"
 	depends on VIDEO_V4L1

drivers/media/video/Makefile +0 -1

index bb702c9..e3603b4 100644
@@ -105,7 +105,6 @@ obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/
 obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
 obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
-obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
 obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
 obj-$(CONFIG_VIDEO_MXB) += mxb.o
 obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o

drivers/media/video/ovcamchip/Makefile deleted +0 -4

deleted file mode 100644
index cba4cdf..0000000
@@ -1,4 +0,0 @@
-ovcamchip-objs     := ovcamchip_core.o ov6x20.o ov6x30.o ov7x10.o ov7x20.o \
-		      ov76be.o
-
-obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip.o

drivers/media/video/ovcamchip/ov6x20.c deleted +0 ~~-414~~

414 lines not on this page · raw message

drivers/media/video/ovcamchip/ov6x30.c deleted +0 ~~-373~~

373 lines not on this page · raw message

drivers/media/video/ovcamchip/ov76be.c deleted +0 ~~-302~~

302 lines not on this page · raw message

drivers/media/video/ovcamchip/ov7x10.c deleted +0 ~~-334~~

334 lines not on this page · raw message

drivers/media/video/ovcamchip/ov7x20.c deleted +0 ~~-454~~

454 lines not on this page · raw message

drivers/media/video/ovcamchip/ovcamchip_core.c deleted +0 ~~-395~~

395 lines not on this page · raw message

drivers/media/video/ovcamchip/ovcamchip_priv.h deleted +0 ~~-101~~

101 lines not on this page · raw message

Signature · 1 line

1.6.5.2

Amerigo Wang

author

2010-05-28 17:03 UTC #5 lore raw

PATCH 5/6 Remove obsolete stv680 v4l1 driver

In reply to Amerigo Wang

From: Amerigo Wang <[email protected]>
Date: Fri, 28 May 2010 17:49:57 +0800
Subject: [PATCH 5/6] Remove obsolete stv680 v4l1 driver

obsolete v4l1 driver replaced by gspca_stv0680

Cc Hans de Goede <[email protected]>

Signed-off-by Amerigo Wang <[email protected]>

---
 Documentation/feature-removal-schedule.txt |    8 -
 drivers/media/video/Kconfig                |   17 -
 drivers/media/video/Makefile               |    1 -
 drivers/media/video/stv680.c               | 1565 ----------------------------
 drivers/media/video/stv680.h               |  227 ----
 5 files changed, 0 insertions(+), 1818 deletions(-)
 delete mode 100644 drivers/media/video/stv680.c
 delete mode 100644 drivers/media/video/stv680.h

Documentation/feature-removal-schedule.txt +0 -8

index 42bb6e6..5a29615 100644
@@ -459,14 +459,6 @@ Who:	Corentin Chary <[email protected]>
 
 ----------------------------
 
-What:	stv680 v4l1 driver
-When:	2.6.35
-Files:	drivers/media/video/stv680.[ch]
-Why:	obsolete v4l1 driver replaced by gspca_stv0680
-Who:	Hans de Goede <[email protected]>
-
-----------------------------
-
 What:	zc0301 v4l driver
 When:	2.6.35
 Files:	drivers/media/video/zc0301/*

drivers/media/video/Kconfig +0 ~~-17~~

index de12f93..4361fe6 100644
@@ -1013,23 +1013,6 @@ config USB_SE401
 
 source "drivers/media/video/sn9c102/Kconfig"
 
-config USB_STV680
-	tristate "USB STV680 (Pencam) Camera support (DEPRECATED)"
-	depends on VIDEO_V4L1
-	default n
-	---help---
-	  This driver is DEPRECATED please use the gspca stv0680 module
-	  instead. Note that for the gspca stv0680 module you need
-	  atleast version 0.6.3 of libv4l.
-
-	  Say Y here if you want to connect this type of camera to your
-	  computer's USB port. This includes the Pencam line of cameras.
-	  See <file:Documentation/video4linux/stv680.txt> for more information
-	  and for a list of supported cameras.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called stv680.
-
 source "drivers/media/video/zc0301/Kconfig"
 
 source "drivers/media/video/pwc/Kconfig"

drivers/media/video/Makefile +0 -1

index e3603b4..5c2a38e 100644
@@ -127,7 +127,6 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
 
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o
 obj-$(CONFIG_USB_SE401)         += se401.o
-obj-$(CONFIG_USB_STV680)        += stv680.o
 obj-$(CONFIG_USB_ZR364XX)       += zr364xx.o
 obj-$(CONFIG_USB_STKWEBCAM)     += stkwebcam.o

drivers/media/video/stv680.c deleted +0 ~~-1565~~

1,565 lines not on this page · raw message

drivers/media/video/stv680.h deleted +0 ~~-227~~

227 lines not on this page · raw message

Signature · 1 line

1.6.5.2

Amerigo Wang

author

2010-05-28 17:03 UTC #6 lore raw

PATCH 6/6 Remove obsolete zc0301 v4l driver

In reply to Amerigo Wang

From: Amerigo Wang <[email protected]>
Date: Fri, 28 May 2010 17:53:47 +0800
Subject: [PATCH 6/6] Remove obsolete zc0301 v4l driver

Duplicate functionality with the gspca_zc3xx driver, zc0301 only supports 2 USB-ID's (because it only supports a limited set of sensors) wich are also supported by the gspca_zc3xx driver (which supports 53 USB-ID's in total).

Cc Hans de Goede <[email protected]>

Signed-off-by Amerigo Wang <[email protected]>

---
 Documentation/feature-removal-schedule.txt    |   11 -
 drivers/media/video/Kconfig                   |    2 -
 drivers/media/video/Makefile                  |    1 -
 drivers/media/video/zc0301/Kconfig            |   15 -
 drivers/media/video/zc0301/Makefile           |    3 -
 drivers/media/video/zc0301/zc0301.h           |  196 ---
 drivers/media/video/zc0301/zc0301_core.c      | 2098 -------------------------
 drivers/media/video/zc0301/zc0301_pas202bcb.c |  362 -----
 drivers/media/video/zc0301/zc0301_pb0330.c    |  188 ---
 drivers/media/video/zc0301/zc0301_sensor.h    |  107 --
 10 files changed, 0 insertions(+), 2983 deletions(-)
 delete mode 100644 drivers/media/video/zc0301/Kconfig
 delete mode 100644 drivers/media/video/zc0301/Makefile
 delete mode 100644 drivers/media/video/zc0301/zc0301.h
 delete mode 100644 drivers/media/video/zc0301/zc0301_core.c
 delete mode 100644 drivers/media/video/zc0301/zc0301_pas202bcb.c
 delete mode 100644 drivers/media/video/zc0301/zc0301_pb0330.c
 delete mode 100644 drivers/media/video/zc0301/zc0301_sensor.h

Documentation/feature-removal-schedule.txt +0 ~~-11~~

index 5a29615..a1b33b1 100644
@@ -459,17 +459,6 @@ Who:	Corentin Chary <[email protected]>
 
 ----------------------------
 
-What:	zc0301 v4l driver
-When:	2.6.35
-Files:	drivers/media/video/zc0301/*
-Why:	Duplicate functionality with the gspca_zc3xx driver, zc0301 only
-	supports 2 USB-ID's (because it only supports a limited set of
-	sensors) wich are also supported by the gspca_zc3xx driver
-	(which supports 53 USB-ID's in total)
-Who:	Hans de Goede <[email protected]>
-
-----------------------------
-
 What:	sysfs-class-rfkill state file
 When:	Feb 2014
 Files:	net/rfkill/core.c

drivers/media/video/Kconfig +0 -2

index 4361fe6..01f3696 100644
@@ -1013,8 +1013,6 @@ config USB_SE401
 
 source "drivers/media/video/sn9c102/Kconfig"
 
-source "drivers/media/video/zc0301/Kconfig"
-
 source "drivers/media/video/pwc/Kconfig"
 
 config USB_ZR364XX

drivers/media/video/Makefile +0 -1

index 5c2a38e..2beb4e4 100644
@@ -133,7 +133,6 @@ obj-$(CONFIG_USB_STKWEBCAM)     += stkwebcam.o
 obj-$(CONFIG_USB_SN9C102)       += sn9c102/
 obj-$(CONFIG_USB_ET61X251)      += et61x251/
 obj-$(CONFIG_USB_PWC)           += pwc/
-obj-$(CONFIG_USB_ZC0301)        += zc0301/
 obj-$(CONFIG_USB_GSPCA)         += gspca/
 
 obj-$(CONFIG_VIDEO_HDPVR)	+= hdpvr/

drivers/media/video/zc0301/Kconfig deleted +0 ~~-15~~

deleted file mode 100644
index a7e610e..0000000
@@ -1,15 +0,0 @@
-config USB_ZC0301
-	tristate "USB ZC0301[P] webcam support (DEPRECATED)"
-	depends on VIDEO_V4L2
-	default n
-	---help---
-	  This driver is DEPRECATED please use the gspca zc3xx module
-	  instead.
-
-	  Say Y here if you want support for cameras based on the ZC0301 or
-	  ZC0301P Image Processors and Control Chips.
-
-	  See <file:Documentation/video4linux/zc0301.txt> for more info.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called zc0301.

drivers/media/video/zc0301/Makefile deleted +0 -3

deleted file mode 100644
index d9e6d97..0000000
@@ -1,3 +0,0 @@
-zc0301-objs     := zc0301_core.o zc0301_pb0330.o zc0301_pas202bcb.o
-
-obj-$(CONFIG_USB_ZC0301)        += zc0301.o

drivers/media/video/zc0301/zc0301.h deleted +0 ~~-196~~

196 lines not on this page · raw message

drivers/media/video/zc0301/zc0301_core.c deleted +0 ~~-2098~~

2,098 lines not on this page · raw message

drivers/media/video/zc0301/zc0301_pas202bcb.c deleted +0 ~~-362~~

362 lines not on this page · raw message

drivers/media/video/zc0301/zc0301_pb0330.c deleted +0 ~~-188~~

188 lines not on this page · raw message

drivers/media/video/zc0301/zc0301_sensor.h deleted +0 ~~-107~~

106 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line

1.6.5.2

Part of the diff is not shown here. View the raw message.

Jean-Francois Moine

2010-05-28 17:29 UTC #7 lore raw

Re: [PATCH 6/6] Remove obsolete zc0301 v4l driver

Quoted 6 lines · On Fri, 28 May 2010 13:03:28 -0400 Amerigo Wang <[email protected]> wrote:

Subject: [PATCH 6/6] Remove obsolete zc0301 v4l driver
Duplicate functionality with the gspca_zc3xx driver, zc0301 only supports 2 USB-ID's (because it only supports a limited set of sensors) wich are also supported by the gspca_zc3xx driver (which supports 53 USB-ID's in total).

You forgot to remove the conditionnal compilation in the gspca_zc3xx driver (USB_DEVICE(0x046d, 0x08ae) in gspca/zc3xx.c)

Signature · 2 lines

Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/

Cong Wang

author

2010-05-31 06:12 UTC #8 lore raw

Re: [PATCH 6/6] Remove obsolete zc0301 v4l driver

Quoted 5 lines · Jean-Francois Moine

Quoted 2 lines · On Fri, 28 May 2010 13:03:28 -0400 Amerigo Wang<[email protected]> wrote:
Subject: [PATCH 6/6] Remove obsolete zc0301 v4l driver

Quoted 8 lines

Quoted 4 lines
Duplicate functionality with the gspca_zc3xx driver, zc0301 only supports 2 USB-ID's (because it only supports a limited set of sensors) wich are also supported by the gspca_zc3xx driver (which supports 53 USB-ID's in total).
You forgot to remove the conditionnal compilation in the gspca_zc3xx driver (USB_DEVICE(0x046d, 0x08ae) in gspca/zc3xx.c)

Right, thanks for pointing this out!

Attached is the updated patch, please use this one instead.

Thanks!

From: Amerigo Wang <[email protected]>
Subject: [PATCH v2 6/6] Remove obsolete zc0301 v4l driver

Cc Hans de Goede <[email protected]>

Signed-off-by Amerigo Wang <[email protected]>

---

 Documentation/feature-removal-schedule.txt    |   11 -
 drivers/media/video/Kconfig                   |    2 -
 drivers/media/video/Makefile                  |    1 -
 drivers/media/video/gspca/zc3xx.c             |    2 -
 drivers/media/video/zc0301/Kconfig            |   15 -
 drivers/media/video/zc0301/Makefile           |    3 -
 drivers/media/video/zc0301/zc0301.h           |  196 ---
 drivers/media/video/zc0301/zc0301_core.c      | 2098 -------------------------
 drivers/media/video/zc0301/zc0301_pas202bcb.c |  362 -----
 drivers/media/video/zc0301/zc0301_pb0330.c    |  188 ---
 drivers/media/video/zc0301/zc0301_sensor.h    |  107 --
 11 files changed, 0 insertions(+), 2985 deletions(-)
 delete mode 100644 drivers/media/video/zc0301/Kconfig
 delete mode 100644 drivers/media/video/zc0301/Makefile
 delete mode 100644 drivers/media/video/zc0301/zc0301.h
 delete mode 100644 drivers/media/video/zc0301/zc0301_core.c
 delete mode 100644 drivers/media/video/zc0301/zc0301_pas202bcb.c
 delete mode 100644 drivers/media/video/zc0301/zc0301_pb0330.c
 delete mode 100644 drivers/media/video/zc0301/zc0301_sensor.h

Documentation/feature-removal-schedule.txt +0 ~~-11~~

index 5a29615..a1b33b1 100644
@@ -459,17 +459,6 @@ Who:	Corentin Chary <[email protected]>
 
 ----------------------------
 
-What:	zc0301 v4l driver
-When:	2.6.35
-Files:	drivers/media/video/zc0301/*
-Why:	Duplicate functionality with the gspca_zc3xx driver, zc0301 only
-	supports 2 USB-ID's (because it only supports a limited set of
-	sensors) wich are also supported by the gspca_zc3xx driver
-	(which supports 53 USB-ID's in total)
-Who:	Hans de Goede <[email protected]>
-
-----------------------------
-
 What:	sysfs-class-rfkill state file
 When:	Feb 2014
 Files:	net/rfkill/core.c

drivers/media/video/Kconfig +0 -2

index 4361fe6..01f3696 100644
@@ -1013,8 +1013,6 @@ config USB_SE401
 
 source "drivers/media/video/sn9c102/Kconfig"
 
-source "drivers/media/video/zc0301/Kconfig"
-
 source "drivers/media/video/pwc/Kconfig"
 
 config USB_ZR364XX

drivers/media/video/Makefile +0 -1

index 5c2a38e..2beb4e4 100644
@@ -133,7 +133,6 @@ obj-$(CONFIG_USB_STKWEBCAM)     += stkwebcam.o
 obj-$(CONFIG_USB_SN9C102)       += sn9c102/
 obj-$(CONFIG_USB_ET61X251)      += et61x251/
 obj-$(CONFIG_USB_PWC)           += pwc/
-obj-$(CONFIG_USB_ZC0301)        += zc0301/
 obj-$(CONFIG_USB_GSPCA)         += gspca/
 
 obj-$(CONFIG_VIDEO_HDPVR)	+= hdpvr/

drivers/media/video/gspca/zc3xx.c +0 -2

index d02aa5c..1ee4741 100644
@@ -7163,9 +7163,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
 	{USB_DEVICE(0x046d, 0x08aa)},
 	{USB_DEVICE(0x046d, 0x08ac)},
 	{USB_DEVICE(0x046d, 0x08ad)},
-#if !defined CONFIG_USB_ZC0301 && !defined CONFIG_USB_ZC0301_MODULE
 	{USB_DEVICE(0x046d, 0x08ae)},
-#endif
 	{USB_DEVICE(0x046d, 0x08af)},
 	{USB_DEVICE(0x046d, 0x08b9)},
 	{USB_DEVICE(0x046d, 0x08d7)},

drivers/media/video/zc0301/Kconfig deleted +0 ~~-15~~

deleted file mode 100644
index a7e610e..0000000
@@ -1,15 +0,0 @@
-config USB_ZC0301
-	tristate "USB ZC0301[P] webcam support (DEPRECATED)"
-	depends on VIDEO_V4L2
-	default n
-	---help---
-	  This driver is DEPRECATED please use the gspca zc3xx module
-	  instead.
-
-	  Say Y here if you want support for cameras based on the ZC0301 or
-	  ZC0301P Image Processors and Control Chips.
-
-	  See <file:Documentation/video4linux/zc0301.txt> for more info.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called zc0301.

drivers/media/video/zc0301/Makefile deleted +0 -3

deleted file mode 100644
index d9e6d97..0000000
@@ -1,3 +0,0 @@
-zc0301-objs     := zc0301_core.o zc0301_pb0330.o zc0301_pas202bcb.o
-
-obj-$(CONFIG_USB_ZC0301)        += zc0301.o

drivers/media/video/zc0301/zc0301.h deleted +0 ~~-196~~

196 lines not on this page · raw message

drivers/media/video/zc0301/zc0301_core.c deleted +0 ~~-2098~~

2,098 lines not on this page · raw message

drivers/media/video/zc0301/zc0301_pas202bcb.c deleted +0 ~~-362~~

362 lines not on this page · raw message

drivers/media/video/zc0301/zc0301_pb0330.c deleted +0 ~~-188~~

188 lines not on this page · raw message

drivers/media/video/zc0301/zc0301_sensor.h deleted +0 ~~-107~~

97 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line

1.6.5.2

Part of the diff is not shown here. View the raw message.