Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] Prefer gspca_sonixb over sn9c102 for all devices

The sn9c102 driver is deprecated. It was moved to staging in
anticipation of its removal in a future kernel version. However, USB
devices 0C45:6024 and 0C45:6025 are still handled by sn9c102 when
both sn9c102 and gspca_sonixb are enabled.

We must migrate all the users of these devices to the gspca_sonixb
driver now, so that it gets sufficient testing before the sn9c102
driver is finally phased out.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

authored by

Jean Delvare and committed by
Mauro Carvalho Chehab
877ed143 c1d1e40b

-4
-2
drivers/media/usb/gspca/sonixb.c
··· 1430 1430 {USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)}, 1431 1431 {USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)}, 1432 1432 {USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)}, 1433 - #if !IS_ENABLED(CONFIG_USB_SN9C102) 1434 1433 {USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)}, 1435 1434 {USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)}, 1436 - #endif 1437 1435 {USB_DEVICE(0x0c45, 0x6027), SB(OV7630, 101)}, /* Genius Eye 310 */ 1438 1436 {USB_DEVICE(0x0c45, 0x6028), SB(PAS202, 102)}, 1439 1437 {USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)},
-2
drivers/staging/media/sn9c102/sn9c102_devtable.h
··· 48 48 { SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), }, 49 49 /* { SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), }, OV6650 */ 50 50 { SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), }, 51 - #endif 52 51 { SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), }, 53 52 { SN9C102_USB_DEVICE(0x0c45, 0x6025, BRIDGE_SN9C102), }, 54 - #if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE 55 53 { SN9C102_USB_DEVICE(0x0c45, 0x6028, BRIDGE_SN9C102), }, 56 54 { SN9C102_USB_DEVICE(0x0c45, 0x6029, BRIDGE_SN9C102), }, 57 55 { SN9C102_USB_DEVICE(0x0c45, 0x602a, BRIDGE_SN9C102), },