From patchwork Sat Mar 19 15:33:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 646031 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2JFXnX0014320 for ; Sat, 19 Mar 2011 15:33:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755464Ab1CSPdR (ORCPT ); Sat, 19 Mar 2011 11:33:17 -0400 Received: from mail1-out1.atlantis.sk ([80.94.52.55]:34636 "EHLO mail.atlantis.sk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754516Ab1CSPdP (ORCPT ); Sat, 19 Mar 2011 11:33:15 -0400 Received: (qmail 31150 invoked from network); 19 Mar 2011 15:33:15 -0000 Received: from unknown (HELO pentium) (rainbow@rainbow-software.org@85.216.180.141) by mail.atlantis.sk with AES256-SHA encrypted SMTP; 19 Mar 2011 15:33:15 -0000 From: Ondrej Zary To: "Hans Verkuil" Subject: [RFC PATCH 2/3] tea575x-tuner: remove dev_nr Date: Sat, 19 Mar 2011 16:33:01 +0100 User-Agent: KMail/1.9.10 Cc: "Takashi Iwai" , jirislaby@gmail.com, alsa-devel@alsa-project.org, "Kernel development list" , linux-media@vger.kernel.org References: <201103121919.05657.linux@rainbow-software.org> <201103141128.01259.linux@rainbow-software.org> <33b29bfb135fbe2ddcba88d342d67526.squirrel@webmail.xs4all.nl> In-Reply-To: <33b29bfb135fbe2ddcba88d342d67526.squirrel@webmail.xs4all.nl> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201103191633.06935.linux@rainbow-software.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 19 Mar 2011 15:33:49 +0000 (UTC) --- linux-2.6.38-rc4-/include/sound/tea575x-tuner.h 2011-03-19 16:00:53.000000000 +0100 +++ linux-2.6.38-rc4/include/sound/tea575x-tuner.h 2011-03-19 16:01:12.000000000 +0100 @@ -37,7 +37,6 @@ struct snd_tea575x_ops { struct snd_tea575x { struct snd_card *card; struct video_device *vd; /* video device */ - int dev_nr; /* requested device number + 1 */ bool tea5759; /* 5759 chip is present */ bool mute; /* Device is muted? */ bool stereo; /* receiving stereo */ --- linux-2.6.38-rc4-/sound/pci/fm801.c 2011-02-08 01:03:55.000000000 +0100 +++ linux-2.6.38-rc4/sound/pci/fm801.c 2011-03-19 16:02:33.000000000 +0100 @@ -1453,7 +1453,6 @@ static int __devinit snd_fm801_create(st #ifdef TEA575X_RADIO if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 && (tea575x_tuner & TUNER_TYPE_MASK) < 4) { - chip->tea.dev_nr = tea575x_tuner >> 16; chip->tea.card = card; chip->tea.freq_fixup = 10700; chip->tea.private_data = chip;