From patchwork Wed Jan 13 15:30:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 566995 X-Patchwork-Delegate: bartekgola@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 87D92140307 for ; Thu, 14 Jan 2016 02:31:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=ptc9VHV4; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751814AbcAMPbb (ORCPT ); Wed, 13 Jan 2016 10:31:31 -0500 Received: from m50-132.163.com ([123.125.50.132]:47039 "EHLO m50-132.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbcAMPb3 (ORCPT ); Wed, 13 Jan 2016 10:31:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=3hIYUHZ9BcjrLxKaVu T6C5pBgi6T9VkI0EdCDjyOp44=; b=ptc9VHV4L6vbTlLdEkrmKd1btsV1Oqq+bP 0xhCFA0Uwax46uHJZoR9n5AaveMwAvIJBq5sZcOSmoRpDM4E4DYsmroc/qoSwQ7H LN5x1dJUsHsUM6kl+cqz9wisgkuYSBsiQGiPNewFxH/SPeG34lEPEGC6nBH93u9W jfxDHWMNs= Received: from localhost (unknown [116.77.137.250]) by smtp2 (Coremail) with SMTP id DNGowEAJ5UaWbZZWzdQHAA--.2508S3; Wed, 13 Jan 2016 23:30:31 +0800 (CST) From: Geliang Tang To: Wolfram Sang , Jean Delvare , Arnd Bergmann , Greg Kroah-Hartman Cc: Geliang Tang , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] misc: eeprom: use kobj_to_dev() Date: Wed, 13 Jan 2016 23:30:11 +0800 Message-Id: X-Mailer: git-send-email 2.5.0 In-Reply-To: <286d4d5f873437fbc91c07369b4b57038c4667ce.1452698603.git.geliangtang@163.com> References: <286d4d5f873437fbc91c07369b4b57038c4667ce.1452698603.git.geliangtang@163.com> In-Reply-To: <286d4d5f873437fbc91c07369b4b57038c4667ce.1452698603.git.geliangtang@163.com> References: <286d4d5f873437fbc91c07369b4b57038c4667ce.1452698603.git.geliangtang@163.com> X-CM-TRANSID: DNGowEAJ5UaWbZZWzdQHAA--.2508S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxCw1UAr1DArW8ArWfCFWrGrg_yoW5ZFW8pF WrAas3ArW5XrsrWws8XF4kuFy3tw1kKryYgry8CwsYgw13AF90kay5tFyDAF1rAFWDtF17 XFWDKry3Kayktr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U8fHUUUUUU= X-Originating-IP: [116.77.137.250] X-CM-SenderInfo: 5jhoxtpqjwt0rj6rljoofrz/1tbiGRfumVXlQhrepwAAso Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Use kobj_to_dev() instead of open-coding it. Signed-off-by: Geliang Tang --- drivers/misc/eeprom/at24.c | 4 ++-- drivers/misc/eeprom/at25.c | 4 ++-- drivers/misc/eeprom/eeprom.c | 2 +- drivers/misc/eeprom/eeprom_93xx46.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 5d7c090..d105c25 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -289,7 +289,7 @@ static ssize_t at24_bin_read(struct file *filp, struct kobject *kobj, { struct at24_data *at24; - at24 = dev_get_drvdata(container_of(kobj, struct device, kobj)); + at24 = dev_get_drvdata(kobj_to_dev(kobj)); return at24_read(at24, buf, off, count); } @@ -420,7 +420,7 @@ static ssize_t at24_bin_write(struct file *filp, struct kobject *kobj, { struct at24_data *at24; - at24 = dev_get_drvdata(container_of(kobj, struct device, kobj)); + at24 = dev_get_drvdata(kobj_to_dev(kobj)); return at24_write(at24, buf, off, count); } diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c index f850ef5..3e9e5a2 100644 --- a/drivers/misc/eeprom/at25.c +++ b/drivers/misc/eeprom/at25.c @@ -139,7 +139,7 @@ at25_bin_read(struct file *filp, struct kobject *kobj, struct device *dev; struct at25_data *at25; - dev = container_of(kobj, struct device, kobj); + dev = kobj_to_dev(kobj); at25 = dev_get_drvdata(dev); return at25_ee_read(at25, buf, off, count); @@ -273,7 +273,7 @@ at25_bin_write(struct file *filp, struct kobject *kobj, struct device *dev; struct at25_data *at25; - dev = container_of(kobj, struct device, kobj); + dev = kobj_to_dev(kobj); at25 = dev_get_drvdata(dev); return at25_ee_write(at25, buf, off, count); diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c index 7342fd6..3d1d551 100644 --- a/drivers/misc/eeprom/eeprom.c +++ b/drivers/misc/eeprom/eeprom.c @@ -84,7 +84,7 @@ static ssize_t eeprom_read(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count) { - struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj)); + struct i2c_client *client = to_i2c_client(kobj_to_dev(kobj)); struct eeprom_data *data = i2c_get_clientdata(client); u8 slice; diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c index ff63f05..473aa0a 100644 --- a/drivers/misc/eeprom/eeprom_93xx46.c +++ b/drivers/misc/eeprom/eeprom_93xx46.c @@ -45,7 +45,7 @@ eeprom_93xx46_bin_read(struct file *filp, struct kobject *kobj, int bits, ret; u16 cmd_addr; - dev = container_of(kobj, struct device, kobj); + dev = kobj_to_dev(kobj); edev = dev_get_drvdata(dev); cmd_addr = OP_READ << edev->addrlen; @@ -190,7 +190,7 @@ eeprom_93xx46_bin_write(struct file *filp, struct kobject *kobj, struct device *dev; int i, ret, step = 1; - dev = container_of(kobj, struct device, kobj); + dev = kobj_to_dev(kobj); edev = dev_get_drvdata(dev); /* only write even number of bytes on 16-bit devices */