From patchwork Thu May 14 19:29:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uri Shkolnik X-Patchwork-Id: 23815 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4EJTcOw026650 for ; Thu, 14 May 2009 19:29:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751388AbZENT3f (ORCPT ); Thu, 14 May 2009 15:29:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752164AbZENT3f (ORCPT ); Thu, 14 May 2009 15:29:35 -0400 Received: from web110809.mail.gq1.yahoo.com ([67.195.13.232]:28341 "HELO web110809.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751388AbZENT3e (ORCPT ); Thu, 14 May 2009 15:29:34 -0400 Received: (qmail 79888 invoked by uid 60001); 14 May 2009 19:29:35 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1242329375; bh=NYTaKADFg9Oom1ow4n36Vzvwtgpd6vjo9YsOaJuDnKA=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:MIME-Version:Content-Type; b=kjHYWz7+nnNziVmxVZO5gN3/KbaSz+h6snt4vBOmro83UuoKYs7uMyEYUjdql7Gu52x3uq4eTBG2FaCrRmdTCRqGj43FmRTmYtGh3uDBqGcPdSd0Bc6g/tTKtKW6PqyZaKqFvACulq5u+sGLoQLgNFdec9OyOrx8/Kg5/E+35ZE= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:MIME-Version:Content-Type; b=r7aAn1vt4W1tKlSKyy54d6+/nmBmJFacVkVCsn90v34ZhZQUGhNygX1+x6q+bydTx5IWYLV2e8mVyov/B3o1HztnYUjMOSBnY1js5LowMs2fvePHhMPzVw0sPYoeng4spDkI847dRsET+ZBhGaF2wqoT/c1fluxt6pbRSG7I2P4=; Message-ID: <521027.71159.qm@web110809.mail.gq1.yahoo.com> X-YMail-OSG: O3r.a4AVM1k6AYdBtilqPutaHxxDDv_ARbdy0qt_1eSo7QMwricwRoI2GZp4x8gpLEUzh3kyzC.pA18FekOVoRqKYrXBZgXA9Rumzsv329KoW5BR.6suxAgBc0bqHzMghYoO_iCjGwCKcnFnYbK5tm2UB9J9tYHibK5hU7EEJtulmUyF89uuRe_TRDs0owhHVXnsS.lXXE0j7eKRU_afhTVYZ7.H.d4OaT20QC3k.uHck0RCh_N33HhSZSyszmJ4jVT2lJ3WqXuxse_mTk7HJd6nbqIlDPeMmkxX6kbggc4TUE70GZcpYueeM.MduEuLA_WSP3w6At1Z1Znu9h7t_GtkocAuYtpNlIlrQm5IBjNx6FOZgtOJLTMKJA-- Received: from [199.203.99.233] by web110809.mail.gq1.yahoo.com via HTTP; Thu, 14 May 2009 12:29:35 PDT X-Mailer: YahooMailClassic/5.3.9 YahooMailWebService/0.7.289.10 Date: Thu, 14 May 2009 12:29:35 -0700 (PDT) From: Uri Shkolnik Subject: [PATCH] [0905_14] Siano: USB - move the device id table to the cards module To: LinuxML MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org # HG changeset patch # User Uri Shkolnik # Date 1242325466 -10800 # Node ID fe5ecbb828340406923d06b4ea93a210aafb5c7e # Parent 5a6de44c39c9198bc1af79f5901dc769690885de [0905_14] Siano: USB - move the device id table to the cards module From: Uri Shkolnik The card modules is the component which handles various targets, so the IDs table should reside within it. Priority: normal Signed-off-by: Uri Shkolnik --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -r 5a6de44c39c9 -r fe5ecbb82834 linux/drivers/media/dvb/siano/sms-cards.c --- a/linux/drivers/media/dvb/siano/sms-cards.c Thu May 14 21:14:46 2009 +0300 +++ b/linux/drivers/media/dvb/siano/sms-cards.c Thu May 14 21:24:26 2009 +0300 @@ -18,6 +18,51 @@ */ #include "sms-cards.h" + +struct usb_device_id smsusb_id_table[] = { + { USB_DEVICE(0x187f, 0x0010), + .driver_info = SMS1XXX_BOARD_SIANO_STELLAR }, + { USB_DEVICE(0x187f, 0x0100), + .driver_info = SMS1XXX_BOARD_SIANO_STELLAR }, + { USB_DEVICE(0x187f, 0x0200), + .driver_info = SMS1XXX_BOARD_SIANO_NOVA_A }, + { USB_DEVICE(0x187f, 0x0201), + .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B }, + { USB_DEVICE(0x187f, 0x0300), + .driver_info = SMS1XXX_BOARD_SIANO_VEGA }, + { USB_DEVICE(0x2040, 0x1700), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT }, + { USB_DEVICE(0x2040, 0x1800), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A }, + { USB_DEVICE(0x2040, 0x1801), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B }, + { USB_DEVICE(0x2040, 0x2000), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, + { USB_DEVICE(0x2040, 0x2009), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 }, + { USB_DEVICE(0x2040, 0x200a), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, + { USB_DEVICE(0x2040, 0x2010), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, + { USB_DEVICE(0x2040, 0x2011), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, + { USB_DEVICE(0x2040, 0x2019), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, + { USB_DEVICE(0x2040, 0x5500), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0x5510), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0x5520), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0x5530), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0x5580), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0x5590), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { } /* Terminating entry */ +}; +MODULE_DEVICE_TABLE(usb, smsusb_id_table); static int sms_dbg; module_param_named(cards_dbg, sms_dbg, int, 0644); diff -r 5a6de44c39c9 -r fe5ecbb82834 linux/drivers/media/dvb/siano/sms-cards.h --- a/linux/drivers/media/dvb/siano/sms-cards.h Thu May 14 21:14:46 2009 +0300 +++ b/linux/drivers/media/dvb/siano/sms-cards.h Thu May 14 21:24:26 2009 +0300 @@ -45,6 +45,8 @@ struct sms_board { struct sms_board *sms_get_board(int id); +extern struct usb_device_id smsusb_id_table[]; + int sms_board_setup(struct smscore_device_t *coredev); #define SMS_LED_OFF 0 diff -r 5a6de44c39c9 -r fe5ecbb82834 linux/drivers/media/dvb/siano/smsusb.c --- a/linux/drivers/media/dvb/siano/smsusb.c Thu May 14 21:14:46 2009 +0300 +++ b/linux/drivers/media/dvb/siano/smsusb.c Thu May 14 21:24:26 2009 +0300 @@ -488,53 +488,6 @@ static int smsusb_resume(struct usb_inte return 0; } -struct usb_device_id smsusb_id_table[] = { -#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS - { USB_DEVICE(0x187f, 0x0010), - .driver_info = SMS1XXX_BOARD_SIANO_STELLAR }, - { USB_DEVICE(0x187f, 0x0100), - .driver_info = SMS1XXX_BOARD_SIANO_STELLAR }, - { USB_DEVICE(0x187f, 0x0200), - .driver_info = SMS1XXX_BOARD_SIANO_NOVA_A }, - { USB_DEVICE(0x187f, 0x0201), - .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B }, - { USB_DEVICE(0x187f, 0x0300), - .driver_info = SMS1XXX_BOARD_SIANO_VEGA }, -#endif - { USB_DEVICE(0x2040, 0x1700), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT }, - { USB_DEVICE(0x2040, 0x1800), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A }, - { USB_DEVICE(0x2040, 0x1801), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B }, - { USB_DEVICE(0x2040, 0x2000), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, - { USB_DEVICE(0x2040, 0x2009), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 }, - { USB_DEVICE(0x2040, 0x200a), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, - { USB_DEVICE(0x2040, 0x2010), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, - { USB_DEVICE(0x2040, 0x2011), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, - { USB_DEVICE(0x2040, 0x2019), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD }, - { USB_DEVICE(0x2040, 0x5500), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, - { USB_DEVICE(0x2040, 0x5510), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, - { USB_DEVICE(0x2040, 0x5520), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, - { USB_DEVICE(0x2040, 0x5530), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, - { USB_DEVICE(0x2040, 0x5580), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, - { USB_DEVICE(0x2040, 0x5590), - .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, - { } /* Terminating entry */ -}; -MODULE_DEVICE_TABLE(usb, smsusb_id_table); - static struct usb_driver smsusb_driver = { .name = "smsusb", .probe = smsusb_probe,