From patchwork Thu Oct 6 09:15:22 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: 8066 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RBk3Y-0007yh-M4; Thu, 06 Oct 2011 11:15:57 +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-1) with esmtp id 1RBk3X-0001Ll-LM; Thu, 06 Oct 2011 11:15:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935708Ab1JFJPS (ORCPT + 4 others); Thu, 6 Oct 2011 05:15:18 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:56961 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935224Ab1JFJPR (ORCPT ); Thu, 6 Oct 2011 05:15:17 -0400 Received: by eyg7 with SMTP id 7so182224eyg.19 for ; Thu, 06 Oct 2011 02:15:16 -0700 (PDT) Received: by 10.223.1.131 with SMTP id 3mr2435191faf.30.1317892515866; Thu, 06 Oct 2011 02:15:15 -0700 (PDT) Received: from useri.localnet ([93.125.112.3]) by mx.google.com with ESMTPS id g19sm6276424fai.8.2011.10.06.02.15.13 (version=SSLv3 cipher=OTHER); Thu, 06 Oct 2011 02:15:14 -0700 (PDT) From: "Igor M. Liplianin" To: =?iso-8859-1?q?Andr=E9_Weidemann?= Subject: Re: [PATCH] pctv452e: hm.. tidy bogus code up Date: Thu, 6 Oct 2011 12:15:22 +0300 User-Agent: KMail/1.13.6 (Linux/3.1.0-rc6+; KDE/4.5.5; x86_64; ; ) Cc: Mauro Chehab , linux-media@vger.kernel.org, Michael Schimek , Hans Petter Selasky , Doychin Dokov , Steffen Barszus , Dominik Kuhlen References: <201109302358.11233.liplianin@me.by> <4E8D6867.7000807@web.de> In-Reply-To: <4E8D6867.7000807@web.de> MIME-Version: 1.0 Message-Id: <201110061215.22452.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.10.6.90914 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, MIME_TEXT_ONLY_MP_MIXED 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, TXT_ATTACHED 0, __ANY_URI 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CP_URI_IN_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __DATE_TZ_RU 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __HIGHBITS 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 , __USER_AGENT 0' 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, T_TVD_MIME_EPI=0.01 autolearn=no ? ????????? ?? 6 ??????? 2011 11:35:51 ????? André Weidemann ???????: > Hi Mauro, > > On 30.09.2011 22:58, Igor M. Liplianin wrote: > > Currently, usb_register calls two times with cloned structures, but for > > different driver names. Let's remove it. > > It looks like the comments and the patch under > http://patchwork.linuxtv.org/patch/8042/ got mixed up. > > Regards, > André git format-patch generated original in attachement. 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, .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);