From patchwork Sun May 11 20:29:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 23882 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1WjaMq-0000Xy-5t; Sun, 11 May 2014 22:29:04 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1WjaMo-00032H-7E; Sun, 11 May 2014 22:29:04 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932549AbaEKU3A (ORCPT + 1 other); Sun, 11 May 2014 16:29:00 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:39040 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932471AbaEKU27 (ORCPT ); Sun, 11 May 2014 16:28:59 -0400 Received: by mail-ee0-f49.google.com with SMTP id e53so4069205eek.8 for ; Sun, 11 May 2014 13:28:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=1rzpMV9fx7Bct5iCRAHBHt/6aHxLDeX3uke+zpkiSNY=; b=uq1Ent6TFOjVcUHTEkfZRni9Vrhp7CFpf4iGzyK0EcoQRuJre5WgntgAxQ/yCm/U8Z Rmfe2JUHDcsocLdk0SAgRfdDCw9pNeQSDnbxvvcRhbgQ55uw2QTrUP4kMaGgXsPD65Dn WLhRkxTp27QFYuLckIztFjqtTrDP0nuIZWXhxHkUd6FC3KbJZ6+QEiwhioQnt5L6d0lz iZOtyZ5vcPN93ua/G2tetpp3MtJXAcfSU3gL1nwWkPE2XTyMkWuwaSpvw3KamyR2f7FD wlTtu1MEElHZ18IZ1y3dyeahSW7LtViU9yQ6pzr9lTp4b6LPKHWVjqOOnz2EOEwdovbB zROg== X-Received: by 10.14.194.4 with SMTP id l4mr7782698een.74.1399840138644; Sun, 11 May 2014 13:28:58 -0700 (PDT) Received: from Athlon64X2-5000.lan (ip-109-90-213-136.unitymediagroup.de. [109.90.213.136]) by mx.google.com with ESMTPSA id x45sm27805454eef.15.2014.05.11.13.28.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 May 2014 13:28:57 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: hverkuil@xs4all.nl Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH] em28xx: remove the i2c_set_adapdata() call in em28xx_i2c_register() Date: Sun, 11 May 2014 22:29:07 +0200 Message-Id: <1399840147-2704-1-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.5.11.202119 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_LESS 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, BODY_SIZE_900_999 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' It is no longer needed since nobody is calling i2c_get_adapdata() anymore. Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c index ba6433c..04e8577 100644 --- a/drivers/media/usb/em28xx/em28xx-i2c.c +++ b/drivers/media/usb/em28xx/em28xx-i2c.c @@ -939,7 +939,6 @@ int em28xx_i2c_register(struct em28xx *dev, unsigned bus, dev->i2c_bus[bus].algo_type = algo_type; dev->i2c_bus[bus].dev = dev; dev->i2c_adap[bus].algo_data = &dev->i2c_bus[bus]; - i2c_set_adapdata(&dev->i2c_adap[bus], &dev->v4l2_dev); retval = i2c_add_adapter(&dev->i2c_adap[bus]); if (retval < 0) {