From patchwork Mon Apr 30 07:38:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 906518 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-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GcXXtzws"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40ZGf32J8Nz9rxs for ; Mon, 30 Apr 2018 17:39:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752285AbeD3Hjx (ORCPT ); Mon, 30 Apr 2018 03:39:53 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:34876 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752407AbeD3Hib (ORCPT ); Mon, 30 Apr 2018 03:38:31 -0400 Received: by mail-wr0-f195.google.com with SMTP id i14-v6so3915616wre.2; Mon, 30 Apr 2018 00:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K21NYlmYRvow1h5ij6qCGS9Fw95TmMGrK38AQBovM8I=; b=GcXXtzwskwnFpMymDURUz8Qr0+cfOVjRvbrjBJ0unT05Oxw7slCLGS8XVt/aswKree FZD9mWQ2U1cDf/7eaZd7jD0FVqhwR00UQxBrKnxX6Bxtn/f0Y6KUn/hgNgnBCmfOKHH3 17SSglrNP9M3swO0NpWbwEF93m+Ize6vM0ioCRnFZQ66eP2YzAf2bsKmBAyAZ/AC2BRq GRug2FOm6s9Mfqw1MWRouGad0szrQ7DBKHKnApAX97yluK6dM4EjG0gJjhVRxfEyjoIU z2+uzTm+LF8ZzPtX64eRzGmJ2dZ/BvXttrLKUPH3ekAZNWAZdBMSxm/RgHe/xnWNAdfT Kk4g== 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=K21NYlmYRvow1h5ij6qCGS9Fw95TmMGrK38AQBovM8I=; b=UeMj97fxtP3T9KskfLyoBTmXrvCItkGcbvUc66K6AYxQdBOF/V+vFeNpMMR9ZD25dG VBh+dlVJo+KfEwKmajmgtvcP0+tyuNaOJVoYLrbU1coC4U5SV9BNurwbS4suOm7hRPj6 PORpQAJnn9pxstjkcry14qGffqS0Sa0CtDk1oSKHspjO8JQC3A6OYRUTp2qnQ8QJYKjC aZXrrT/EQWSU+rqBfg265ptHeWnpGyhY0yogYQ7R+SzK7yoRUbL3xHC4UtqPlAUopP5S KreGHNZohnjSIhW5Xg7tkcxh2okIUhkXIfekZ2mbXmSSa0/jPClPaLq9tYBZW+ICqM+q Wz7Q== X-Gm-Message-State: ALQs6tDvypregB0VsOIJA9wKOTHD9JdyKqxUYlTw9k7vBSgPe/Zjg8Zn HPD+6xHpfDLLm9eOwjqmL83/Dw== X-Google-Smtp-Source: AB8JxZo/Qc8Zq6s9aaHvng/uoZwc9EycKRZ7Z5DxQzxEgX01FGhEuMC9AgPJNDdUG14CD0cpMPEc1w== X-Received: by 2002:adf:b067:: with SMTP id g36-v6mr7806120wra.128.1525073910242; Mon, 30 Apr 2018 00:38:30 -0700 (PDT) Received: from localhost (p200300E41F041C0032947E635CB49D15.dip0.t-ipconnect.de. [2003:e4:1f04:1c00:3294:7e63:5cb4:9d15]) by smtp.gmail.com with ESMTPSA id i10sm7609645wmf.24.2018.04.30.00.38.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 00:38:29 -0700 (PDT) From: Thierry Reding To: Linus Walleij Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/12] gpio: pca953x: Use of_device_get_match_data() Date: Mon, 30 Apr 2018 09:38:14 +0200 Message-Id: <20180430073819.31827-7-thierry.reding@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180430073819.31827-1-thierry.reding@gmail.com> References: <20180430073819.31827-1-thierry.reding@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Thierry Reding Use of_device_get_match_data() instead of open-coding it. Signed-off-by: Thierry Reding --- drivers/gpio/gpio-pca953x.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index d2ead4b1cf61..9a06b8a4f5be 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -810,13 +810,11 @@ static int pca953x_probe(struct i2c_client *client, chip->driver_data = i2c_id->driver_data; } else { const struct acpi_device_id *acpi_id; - const struct of_device_id *match; + struct device *dev = &client->dev; - match = of_match_device(pca953x_dt_ids, &client->dev); - if (match) { - chip->driver_data = (int)(uintptr_t)match->data; - } else { - acpi_id = acpi_match_device(pca953x_acpi_ids, &client->dev); + chip->driver_data = (uintptr_t)of_device_get_match_data(dev); + if (!chip->driver_data) { + acpi_id = acpi_match_device(pca953x_acpi_ids, dev); if (!acpi_id) { ret = -ENODEV; goto err_exit;