From patchwork Fri Sep 30 20:58:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Igor M. Liplianin" X-Patchwork-Id: 8042 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1R9k9v-00087a-OM; Fri, 30 Sep 2011 22:58:16 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp id 1R9k9u-0002qu-JL; Fri, 30 Sep 2011 22:58:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754225Ab1I3U6M (ORCPT + 4 others); Fri, 30 Sep 2011 16:58:12 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:64189 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752473Ab1I3U6M (ORCPT ); Fri, 30 Sep 2011 16:58:12 -0400 Received: by fxe4 with SMTP id 4so3354208fxe.19 for ; Fri, 30 Sep 2011 13:58:10 -0700 (PDT) Received: by 10.223.76.67 with SMTP id b3mr19234068fak.61.1317416290788; Fri, 30 Sep 2011 13:58:10 -0700 (PDT) Received: from useri.localnet ([93.125.112.3]) by mx.google.com with ESMTPS id n1sm8284496fad.20.2011.09.30.13.58.09 (version=SSLv3 cipher=OTHER); Fri, 30 Sep 2011 13:58:10 -0700 (PDT) Subject: [PATCH] pctv452e: hm.. tidy bogus code up To: Mauro Chehab From: "Igor M. Liplianin" Cc: linux-media@vger.kernel.org, Michael Schimek , Hans Petter Selasky , Doychin Dokov , Steffen Barszus , Dominik Kuhlen Date: Fri, 30 Sep 2011 23:58:11 +0300 MIME-Version: 1.0 Message-Id: <201109302358.11233.liplianin@me.by> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.9.30.205115 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1900_1999 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TP_8859_1 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __DATE_TZ_RU 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: 1.8 (+) X-LSpam-Report: No, score=1.8 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, KB_DATE_CONTAINS_TAB=2.751, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_SORBS_WEB=0.77, TAB_IN_FROM=2.494 autolearn=no Currently, usb_register calls two times with cloned structures, but for .devices = { @@ -1055,22 +1055,9 @@ static struct usb_driver pctv452e_usb_driver = { .id_table = pctv452e_usb_table, }; -static struct usb_driver tt_connects2_3600_usb_driver = { - .name = "dvb-usb-tt-connect-s2-3600-01.fw", - .probe = pctv452e_usb_probe, - .disconnect = pctv452e_usb_disconnect, - .id_table = pctv452e_usb_table, -}; - static int __init pctv452e_usb_init(void) { int ret = usb_register(&pctv452e_usb_driver); - - if (ret) { - err("%s: usb_register failed! Error %d", __FILE__, ret); - return ret; - } - ret = usb_register(&tt_connects2_3600_usb_driver); if (ret) err("%s: usb_register failed! Error %d", __FILE__, ret); @@ -1080,7 +1067,6 @@ static int __init pctv452e_usb_init(void) static void __exit pctv452e_usb_exit(void) { usb_deregister(&pctv452e_usb_driver); - usb_deregister(&tt_connects2_3600_usb_driver); } module_init(pctv452e_usb_init); Acked-by: André Weideamm Acked-by: André Weidemann different driver names. Let's remove it. Signed-off-by: Igor M. Liplianin --- drivers/media/dvb/dvb-usb/pctv452e.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/drivers/media/dvb/dvb-usb/pctv452e.c b/drivers/media/dvb/dvb- usb/pctv452e.c index 9a5c811..f9aec5c 100644 --- a/drivers/media/dvb/dvb-usb/pctv452e.c +++ b/drivers/media/dvb/dvb-usb/pctv452e.c @@ -1012,7 +1012,7 @@ static struct dvb_usb_device_properties tt_connect_s2_3600_properties = { .i2c_algo = &pctv452e_i2c_algo, - .generic_bulk_ctrl_endpoint = 1, /* allow generice rw function*/ + .generic_bulk_ctrl_endpoint = 1, /* allow generic rw function*/ .num_device_descs = 2,