From patchwork Fri Nov 5 20:06:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 304742 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 oA5K7BEb007550 for ; Fri, 5 Nov 2010 20:07:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754827Ab0KEUG6 (ORCPT ); Fri, 5 Nov 2010 16:06:58 -0400 Received: from zone0.gcu-squad.org ([212.85.147.21]:20292 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752300Ab0KEUG6 (ORCPT ); Fri, 5 Nov 2010 16:06:58 -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 1PESeu-0000oP-HZ (TLSv1:AES128-SHA:128) (envelope-from ) ; Fri, 05 Nov 2010 21:13:12 +0100 Date: Fri, 5 Nov 2010 21:06:45 +0100 From: Jean Delvare To: Linux I2C , LMML Cc: Hans Verkuil , Jarod Wilson Subject: [PATCH 1/3] i2c: Delete unused adapter IDs Message-ID: <20101105210645.6e47498c@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]); Fri, 05 Nov 2010 20:07:12 +0000 (UTC) --- linux-2.6.37-rc1.orig/include/linux/i2c-id.h 2010-11-05 13:55:17.000000000 +0100 +++ linux-2.6.37-rc1/include/linux/i2c-id.h 2010-11-05 15:05:32.000000000 +0100 @@ -32,28 +32,6 @@ */ /* --- Bit algorithm adapters */ -#define I2C_HW_B_BT848 0x010005 /* BT848 video boards */ -#define I2C_HW_B_RIVA 0x010010 /* Riva based graphics cards */ -#define I2C_HW_B_ZR36067 0x010019 /* Zoran-36057/36067 based boards */ #define I2C_HW_B_CX2388x 0x01001b /* connexant 2388x based tv cards */ -#define I2C_HW_B_EM28XX 0x01001f /* em28xx video capture cards */ -#define I2C_HW_B_CX2341X 0x010020 /* Conexant CX2341X MPEG encoder cards */ -#define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */ -#define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */ -#define I2C_HW_B_CX231XX 0x010024 /* Conexant CX231XX USB based cards */ -#define I2C_HW_B_HDPVR 0x010025 /* Hauppauge HD PVR */ - -/* --- SGI adapters */ -#define I2C_HW_SGI_VINO 0x160000 - -/* --- SMBus only adapters */ -#define I2C_HW_SMBUS_W9968CF 0x04000d -#define I2C_HW_SMBUS_OV511 0x04000e /* OV511(+) USB 1.1 webcam ICs */ -#define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ -#define I2C_HW_SMBUS_CAFE 0x040012 /* Marvell 88ALP01 "CAFE" cam */ - -/* --- Miscellaneous adapters */ -#define I2C_HW_SAA7146 0x060000 /* SAA7146 video decoder bus */ -#define I2C_HW_SAA7134 0x090000 /* SAA7134 video decoder bus */ #endif /* LINUX_I2C_ID_H */ --- linux-2.6.37-rc1.orig/drivers/video/riva/rivafb-i2c.c 2010-11-05 13:55:17.000000000 +0100 +++ linux-2.6.37-rc1/drivers/video/riva/rivafb-i2c.c 2010-11-05 13:55:19.000000000 +0100 @@ -94,7 +94,6 @@ static int __devinit riva_setup_i2c_bus( strcpy(chan->adapter.name, name); chan->adapter.owner = THIS_MODULE; - chan->adapter.id = I2C_HW_B_RIVA; chan->adapter.class = i2c_class; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->par->pdev->dev;