From patchwork Wed Feb 5 22:15:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hogan X-Patchwork-Id: 3592211 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 3D4769F2E9 for ; Wed, 5 Feb 2014 22:22:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BD102018B for ; Wed, 5 Feb 2014 22:22:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2877820170 for ; Wed, 5 Feb 2014 22:22:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755705AbaBEWPd (ORCPT ); Wed, 5 Feb 2014 17:15:33 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:56786 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755693AbaBEWPa (ORCPT ); Wed, 5 Feb 2014 17:15:30 -0500 Received: by mail-wi0-f179.google.com with SMTP id hn9so1028015wib.6 for ; Wed, 05 Feb 2014 14:15:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=I4zhnLT+WZheFlYU95Q2VKJ30PVW5k1qEgXGfHQzrKA=; b=I0JjgW/G2iiiw9IG9hh8uyErGWTS5VC9Kfwc80SY8bH+YPpaF+nKejkOCUueLO5tbt GyknEh7tsxizVzlmKvKvWVMbW4wK/zyyPW/12oOtA3lR/3IImFM+r80V8o021oKFqc+t Bx5Po7xaaDG599tiHS5zJbQDM7t+K0SQc719e5oe6LJHw4yX0u6d60HLtGd2IlcBfba9 AfZmh+2FhpfjvesdPyY44cFUVfYW7wyDN5x08pgIMBO8zWa+02ijnYfk1gHfzZwTZSjU otf1ICSDBri7fN6CuRVf4+thUDyX8HzfbC/7G3N3VfTDXyjr2zStbkJ+cDJ/AuJ4+AYq HAYA== X-Gm-Message-State: ALoCoQnDbVZbEEr/Ys+eTkWDDMSev3Hxz5E9WD/q+e4ndJ8nCewaBRYZiQCET2rojQHF9jxjRmQt X-Received: by 10.180.164.229 with SMTP id yt5mr6514262wib.49.1391638528562; Wed, 05 Feb 2014 14:15:28 -0800 (PST) Received: from radagast.lan (jahogan.plus.com. [212.159.75.221]) by mx.google.com with ESMTPSA id z1sm64870911wjq.19.2014.02.05.14.15.27 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Wed, 05 Feb 2014 14:15:27 -0800 (PST) From: James Hogan To: linux-media@vger.kernel.org, Mauro Carvalho Chehab Cc: James Hogan Subject: [PATCH] rc: ir-raw: Load ir-sharp-decoder module at init Date: Wed, 5 Feb 2014 22:15:16 +0000 Message-Id: <1391638516-23952-1-git-send-email-james.hogan@imgtec.com> X-Mailer: git-send-email 1.8.3.2 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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Commit 1d184b0bc13d ([media] media: rc: add raw decoder for Sharp protocol) added a new raw IR decoder for the sharp protocol, but didn't add the code to load the module at init as is done for other raw decoders, so add that code now. Signed-off-by: James Hogan Cc: Mauro Carvalho Chehab --- I'm not sure if the media tree gets rebased, but if so this could happily be squashed into the sharp decoder commit. --- drivers/media/rc/ir-raw.c | 1 + drivers/media/rc/rc-core-priv.h | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c index 5c42750..79a9cb6 100644 --- a/drivers/media/rc/ir-raw.c +++ b/drivers/media/rc/ir-raw.c @@ -352,6 +352,7 @@ void ir_raw_init(void) load_jvc_decode(); load_sony_decode(); load_sanyo_decode(); + load_sharp_decode(); load_mce_kbd_decode(); load_lirc_codec(); diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h index c40d666..dc3b0b7 100644 --- a/drivers/media/rc/rc-core-priv.h +++ b/drivers/media/rc/rc-core-priv.h @@ -210,6 +210,13 @@ static inline void load_sony_decode(void) { } static inline void load_sanyo_decode(void) { } #endif +/* from ir-sharp-decoder.c */ +#ifdef CONFIG_IR_SHARP_DECODER_MODULE +#define load_sharp_decode() request_module_nowait("ir-sharp-decoder") +#else +static inline void load_sharp_decode(void) { } +#endif + /* from ir-mce_kbd-decoder.c */ #ifdef CONFIG_IR_MCE_KBD_DECODER_MODULE #define load_mce_kbd_decode() request_module_nowait("ir-mce_kbd-decoder")