From patchwork Mon Mar 19 09:17:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 887627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="E2+zFs85"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 404Vp82F69z9sSx for ; Mon, 19 Mar 2018 20:17:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932932AbeCSJRe (ORCPT ); Mon, 19 Mar 2018 05:17:34 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:43582 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932818AbeCSJR3 (ORCPT ); Mon, 19 Mar 2018 05:17:29 -0400 Received: by mail-wr0-f195.google.com with SMTP id o1so17752149wro.10 for ; Mon, 19 Mar 2018 02:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RiW5ljRh2wjDgTrvwWxaVLDsTVg8vUwjEhNT8VwwwXw=; b=E2+zFs85+mOZoI6xz8vEWovzHeRRx0wcjuEBCH8vbl58ZYvZGwPOcnG/08PjxWGc24 xjulrjps3UCNXKaSAnwqRV5K+e1d+Awate+uHGpdyEHP/X8rmGJhsHEcemKVhiILvAjN 014Kesipa+vR9oMxsCxcRosf/qxCTQ3OyxT62hlgHD7LG8zP9eCUaaoDdp9dp/CtNTwE qCwPBM7Di1vtIxUgh5OzB3Cp6kAdoP4e8u7zCuDcim0PaqZ3cbyHpdW8O3UyTtVnHTbS sEjk5FrXLYWzwRnLSGk6X5zZczy6GKfOf5ijsRMcnCcqOMsr0sB9NK6sqFI3t7BNlHkN 3NHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RiW5ljRh2wjDgTrvwWxaVLDsTVg8vUwjEhNT8VwwwXw=; b=D9vM+o94W9GtzBKUVWZmohHZXE8K+PLZs7WmX1QQXyAqtH0yI3bIjkWsVEsellyr/z COMN2u+n9ToGw/B0Ro2bUPZiK0QLohNqsA1yfM3pUV71tok/9fVJ171BgQYGT4xrsmEH eO4Zk2+zasAA7xmQ9QECDSeoDaoacL9MsQcsPR8U94UcRDSyZFEsa+DD2cFVsdcrYZse q1XvvRFwbIINXKNmnEyDa967BchER1Ed1cw/IAPOgsmwgqvyswpG+zC7s+i+fUZZRAUy 4aNhjcvHffrUT1X4rdqwNct/BMPJbK+j4EwNzywldkI+dcmk3r1X2HflJUPwRiRs1/LT iMiA== X-Gm-Message-State: AElRT7Er7XjlpGl3gy87Zm3jy5lepQv9Lyp4fF/wY7OHavxbw8xvr5EO NRN+UlmPWj3DGu1+IYcZZh26jg== X-Google-Smtp-Source: AG47ELthlpfw32Qjw+tSRnnsNLG9k1ReXHGq72KmM6nmKvIcjxNfoPAIMw99BtkbYXP4Dge4VkYrTA== X-Received: by 10.223.192.74 with SMTP id c10mr9131495wrf.145.1521451048097; Mon, 19 Mar 2018 02:17:28 -0700 (PDT) Received: from brgl-bgdev.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id h20sm16650728wrf.65.2018.03.19.02.17.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 02:17:27 -0700 (PDT) From: Bartosz Golaszewski To: Arnd Bergmann , Greg Kroah-Hartman Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 02/21] eeprom: at24: remove nvmem_config from at24_data Date: Mon, 19 Mar 2018 10:17:02 +0100 Message-Id: <20180319091721.18193-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180319091721.18193-1-brgl@bgdev.pl> References: <20180319091721.18193-1-brgl@bgdev.pl> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org This structure only needs to exist during the call to nvmem_register(). Signed-off-by: Bartosz Golaszewski --- drivers/misc/eeprom/at24.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 73af6c5a2d73..2600657c7034 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -75,7 +75,6 @@ struct at24_data { unsigned int num_addresses; unsigned int offset_adj; - struct nvmem_config nvmem_config; struct nvmem_device *nvmem; struct gpio_desc *wp_gpio; @@ -523,6 +522,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) int err; unsigned int i, num_addresses; struct regmap_config regmap_config = { }; + struct nvmem_config nvmem_config = { }; u8 test_byte; if (client->dev.platform_data) { @@ -650,21 +650,21 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) goto err_clients; } - at24->nvmem_config.name = dev_name(&client->dev); - at24->nvmem_config.dev = &client->dev; - at24->nvmem_config.read_only = !writable; - at24->nvmem_config.root_only = true; - at24->nvmem_config.owner = THIS_MODULE; - at24->nvmem_config.compat = true; - at24->nvmem_config.base_dev = &client->dev; - at24->nvmem_config.reg_read = at24_read; - at24->nvmem_config.reg_write = at24_write; - at24->nvmem_config.priv = at24; - at24->nvmem_config.stride = 1; - at24->nvmem_config.word_size = 1; - at24->nvmem_config.size = chip.byte_len; - - at24->nvmem = nvmem_register(&at24->nvmem_config); + nvmem_config.name = dev_name(&client->dev); + nvmem_config.dev = &client->dev; + nvmem_config.read_only = !writable; + nvmem_config.root_only = true; + nvmem_config.owner = THIS_MODULE; + nvmem_config.compat = true; + nvmem_config.base_dev = &client->dev; + nvmem_config.reg_read = at24_read; + nvmem_config.reg_write = at24_write; + nvmem_config.priv = at24; + nvmem_config.stride = 1; + nvmem_config.word_size = 1; + nvmem_config.size = chip.byte_len; + + at24->nvmem = nvmem_register(&nvmem_config); if (IS_ERR(at24->nvmem)) { err = PTR_ERR(at24->nvmem);