From patchwork Fri Apr 11 07:15:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 3966341 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C0E619F391 for ; Fri, 11 Apr 2014 07:15:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E8E2220807 for ; Fri, 11 Apr 2014 07:15:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A53832080F for ; Fri, 11 Apr 2014 07:15:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754811AbaDKHPv (ORCPT ); Fri, 11 Apr 2014 03:15:51 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34904 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754786AbaDKHPi (ORCPT ); Fri, 11 Apr 2014 03:15:38 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DE9C9AAF3; Fri, 11 Apr 2014 07:15:34 +0000 (UTC) Date: Fri, 11 Apr 2014 09:15:32 +0200 From: Jean Delvare To: Hans de Goede , Mauro Carvalho Chehab , Luca Risolia , Greg Kroah-Hartman Cc: linux-media@vger.kernel.org, linux-usb@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH] [media] Prefer gspca_sonixb over sn9c102 for all devices Message-ID: <20140411091532.2a1bcce2@endymion.delvare> Organization: SUSE Linux X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; x86_64-suse-linux-gnu) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Hans de Goede Cc: Mauro Carvalho Chehab Cc: Luca Risolia Cc: Greg Kroah-Hartman Acked-by: Greg Kroah-Hartman Acked-by: Hans de Goede --- I consider this a bug fix, I believe it should go upstream ASAP. drivers/media/usb/gspca/sonixb.c | 2 -- drivers/staging/media/sn9c102/sn9c102_devtable.h | 2 -- 2 files changed, 4 deletions(-) --- linux-3.15-rc0.orig/drivers/media/usb/gspca/sonixb.c 2014-04-11 08:57:26.932408285 +0200 +++ linux-3.15-rc0/drivers/media/usb/gspca/sonixb.c 2014-04-11 09:02:32.151943578 +0200 @@ -1430,10 +1430,8 @@ static const struct usb_device_id device {USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)}, {USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)}, {USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)}, -#if !IS_ENABLED(CONFIG_USB_SN9C102) {USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)}, {USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)}, -#endif {USB_DEVICE(0x0c45, 0x6027), SB(OV7630, 101)}, /* Genius Eye 310 */ {USB_DEVICE(0x0c45, 0x6028), SB(PAS202, 102)}, {USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)}, --- linux-3.15-rc0.orig/drivers/staging/media/sn9c102/sn9c102_devtable.h 2014-04-11 08:57:26.932408285 +0200 +++ linux-3.15-rc0/drivers/staging/media/sn9c102/sn9c102_devtable.h 2014-04-11 09:02:32.151943578 +0200 @@ -48,10 +48,8 @@ static const struct usb_device_id sn9c10 { SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), }, /* { SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), }, OV6650 */ { SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), }, -#endif { SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), }, { SN9C102_USB_DEVICE(0x0c45, 0x6025, BRIDGE_SN9C102), }, -#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE { SN9C102_USB_DEVICE(0x0c45, 0x6028, BRIDGE_SN9C102), }, { SN9C102_USB_DEVICE(0x0c45, 0x6029, BRIDGE_SN9C102), }, { SN9C102_USB_DEVICE(0x0c45, 0x602a, BRIDGE_SN9C102), },