From patchwork Wed Oct 13 12:22:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 250441 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 o9DCNAqS003021 for ; Wed, 13 Oct 2010 12:23:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754044Ab0JMMXG (ORCPT ); Wed, 13 Oct 2010 08:23:06 -0400 Received: from zone0.gcu-squad.org ([212.85.147.21]:18111 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754015Ab0JMMXF (ORCPT ); Wed, 13 Oct 2010 08:23:05 -0400 Received: from jdelvare.pck.nerim.net ([62.212.121.182] helo=endymion.delvare) by services.gcu-squad.org (GCU Mailer Daemon) with esmtpsa id 1P60Rs-0000Da-9U (TLSv1:AES128-SHA:128) (envelope-from ) ; Wed, 13 Oct 2010 14:28:48 +0200 Date: Wed, 13 Oct 2010 14:22:54 +0200 From: Jean Delvare To: Linux I2C , LMML Subject: [PATCH 1/2] i2c: Stop using I2C_CLASS_TV_ANALOG Message-ID: <20101013142254.4581b58b@endymion.delvare> X-Mailer: Claws Mail 3.7.5 (GTK+ 2.20.1; x86_64-unknown-linux-gnu) Mime-Version: 1.0 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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 13 Oct 2010 12:23:11 +0000 (UTC) --- linux-2.6.36-rc7.orig/drivers/media/dvb/ngene/ngene-i2c.c 2010-10-13 12:36:36.000000000 +0200 +++ linux-2.6.36-rc7/drivers/media/dvb/ngene/ngene-i2c.c 2010-10-13 12:36:50.000000000 +0200 @@ -165,7 +165,7 @@ int ngene_i2c_init(struct ngene *dev, in struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter); i2c_set_adapdata(adap, &(dev->channel[dev_nr])); - adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG; + adap->class = I2C_CLASS_TV_DIGITAL; strcpy(adap->name, "nGene"); --- linux-2.6.36-rc7.orig/drivers/media/video/hdpvr/hdpvr-i2c.c 2010-10-13 12:36:36.000000000 +0200 +++ linux-2.6.36-rc7/drivers/media/video/hdpvr/hdpvr-i2c.c 2010-10-13 12:36:50.000000000 +0200 @@ -127,7 +127,6 @@ int hdpvr_register_i2c_adapter(struct hd strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C", sizeof(i2c_adap->name)); i2c_adap->algo = &hdpvr_algo; - i2c_adap->class = I2C_CLASS_TV_ANALOG; i2c_adap->owner = THIS_MODULE; i2c_adap->dev.parent = &dev->udev->dev; --- linux-2.6.36-rc7.orig/drivers/media/video/hexium_gemini.c 2010-10-13 12:36:36.000000000 +0200 +++ linux-2.6.36-rc7/drivers/media/video/hexium_gemini.c 2010-10-13 12:36:50.000000000 +0200 @@ -367,7 +367,6 @@ static int hexium_attach(struct saa7146_ saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); hexium->i2c_adapter = (struct i2c_adapter) { - .class = I2C_CLASS_TV_ANALOG, .name = "hexium gemini", }; saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); --- linux-2.6.36-rc7.orig/drivers/media/video/hexium_orion.c 2010-10-13 12:36:36.000000000 +0200 +++ linux-2.6.36-rc7/drivers/media/video/hexium_orion.c 2010-10-13 12:36:50.000000000 +0200 @@ -230,7 +230,6 @@ static int hexium_probe(struct saa7146_d saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); hexium->i2c_adapter = (struct i2c_adapter) { - .class = I2C_CLASS_TV_ANALOG, .name = "hexium orion", }; saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);