From patchwork Tue May 19 16:24:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uri Shkolnik X-Patchwork-Id: 24757 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 n4JGQ5NV007819 for ; Tue, 19 May 2009 16:26:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755297AbZESQY3 (ORCPT ); Tue, 19 May 2009 12:24:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755345AbZESQY2 (ORCPT ); Tue, 19 May 2009 12:24:28 -0400 Received: from web110806.mail.gq1.yahoo.com ([67.195.13.229]:21595 "HELO web110806.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755369AbZESQY1 (ORCPT ); Tue, 19 May 2009 12:24:27 -0400 Received: (qmail 54923 invoked by uid 60001); 19 May 2009 16:24:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1242750263; bh=u1Pk5BxpFJTdqYDu5LyKYfkhxe7xzYUx9eTav5oXN4M=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:MIME-Version:Content-Type; b=H3r6IGTE0Qu+1IbUtlfJO49IuaHNll91lKK14U86HN6SaVmV9B86Wcwxf6xQbY1V04iOEzDbMlPidqNpMEnn23cKNlyd/hSnz8DVdyqnHnrV3yR5qmHSVwwTjemyz7e47GHT1ljHxgAb2/dif8eLe2WCEApUjTHgVo3WqwT6fFo= 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=GGPi7r7Ov+nxFfnNj2ATqTsHA6NwPiCjI0MckaJWToan0llpG41Zq/T+r+KBarJVMIW9u1TpnhnkRI6cDb4O6MRg8MRmbYLWKEVg2csOZ8mzXRC+QpkJgJk1r60P1IAAIH4AMDM1S1QHZFpl/1PoePGOLvlVZ1mFVncTGBsq5Lg=; Message-ID: <716575.53837.qm@web110806.mail.gq1.yahoo.com> X-YMail-OSG: 3gTYtIsVM1nCrNV3QEG5GcHqzlANb4sHlXeELhKGj1rrs6JLw_THkU1.dnmDtVu4JWYZDpGfonSNoxfwx0f57O4SYmirk2fl0yg8MK8bY3rCHxn1F1Pq696VHmzado368r5x1lcPDFzfSCq0Uyg0mOIPhoHfBi8zlGmGn9xrXleyTyiczHRJxj..F226QGC7muIeMzJ5gQohk3zCoe.jC0iWrtmoyXtOvxrcrHA1H1Tk5fSwz0zitijCUdT_SGd3Us4J25MzyY7fYHQRoJeBrdnPppdf7fy039BxWsRCAGAS.cSnuTtZjpD6SVxjcQSVBzVu9x7S82M9Zz1zOC62zn3p74d4GK3637nUzFfl2vVvFOZFk5BPTaLTFw-- Received: from [199.203.99.233] by web110806.mail.gq1.yahoo.com via HTTP; Tue, 19 May 2009 09:24:23 PDT X-Mailer: YahooMailClassic/5.3.9 YahooMailWebService/0.7.289.10 Date: Tue, 19 May 2009 09:24:23 -0700 (PDT) From: Uri Shkolnik Subject: [PATCH] [09051_55] Siano: smscards - merge the binding handling 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 1242750556 -10800 # Node ID d92f2dfcb226c5f8b8c3216f7cf96126f7571702 # Parent 0296b0c436d6deba48c710cfb510988267cea057 [09051_55] Siano: smscards - merge the binding handling. From: Uri Shkolnik Merge the bind handling into the events switch. 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 0296b0c436d6 -r d92f2dfcb226 linux/drivers/media/dvb/siano/sms-cards.c --- a/linux/drivers/media/dvb/siano/sms-cards.c Tue May 19 19:19:27 2009 +0300 +++ b/linux/drivers/media/dvb/siano/sms-cards.c Tue May 19 19:29:16 2009 +0300 @@ -194,7 +194,13 @@ int sms_board_event(struct smscore_devic case BOARD_EVENT_BIND: switch (board_id) { + case SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT: + case SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A: + case SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B: + request_module("smsdvb"); + break; case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: + request_module("smsdvb"); smscore_gpio_set_level(coredev, board->board_cfg.leds_power, 1); smscore_gpio_set_level(coredev, @@ -366,20 +372,3 @@ int sms_board_lna_control(struct smscore return -EINVAL; } EXPORT_SYMBOL_GPL(sms_board_lna_control); - -int sms_board_load_modules(int id) -{ - switch (id) { - case SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT: - case SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A: - case SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B: - case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: - request_module("smsdvb"); - break; - default: - /* do nothing */ - break; - } - return 0; -} -EXPORT_SYMBOL_GPL(sms_board_load_modules);