From patchwork Fri Oct 6 21:44:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 149428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp610547vqo; Fri, 6 Oct 2023 14:44:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHCyiX9kYzQoYy/gxuucgRFTARtVi38LE+O4eP2YXbKGKdOnJhbxD1a2e6mpO0S4L0ZKtRN X-Received: by 2002:a92:c541:0:b0:351:5b29:8a5a with SMTP id a1-20020a92c541000000b003515b298a5amr11220039ilj.27.1696628669754; Fri, 06 Oct 2023 14:44:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696628669; cv=none; d=google.com; s=arc-20160816; b=b2gPAMi9Z+04JKTeZwYS10gXl9L9SWlZID7xVePR9NaS1yhiGsoCP/QB5STfMhJQGo 1N9DyJKW9qohJr2pFal+lhNZj68MnLAM4OqnwSeKjut1d+nEUWZmaOXhVNRK0VYlmpjp +5UdvjBH/3KGY8RMxuryAMGQ6xqeifiu/WbgWvVczeTRTOPQZR5SbWtW9mLyKID+ev6u 3c2qy4A04rQTXkDl54yG5/DAB9JYv7E0QbpXaTBsm7BqZvDGyNDh74Lc7+6slibvlsDT q0F7/XZTN/+fE6Glh+vSlGWEiYtTBNP3qGqnTIU1HUhs6p9AzZIX0jQxMo5MRMYjIh1U 1RVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=l9l9aOHRIZ6a9g+QeXP1wraUj8nR88dcaWHOYKFfTMc=; fh=20aOYVgk5DcgGovGVFzHDmn12Lh87kfrBX3nFB/aKCQ=; b=lXEXXPWbIpF10fEVguSzasafFDxnVYCLNmwW+TJcIFInSBTnUcDXemGFzPyrJLkHa7 fo2eNjBnbQKj3PyS+0hElIShBbM4R90vvco0CcnxscBWaHDZfl+hrotxsX/CGKDrytxv 55IYhPIzXj4PNSgwb37lbKFL58iZqV7URqbNfsm78KPcf96I8DfvSXUubJHLESUDp7yW sn/BXazgQrgDo+j/9b+da3Pd+BIWRfodY3q9jS6bhZgthZhssUmqviQQxoUqiROsvlRh 1car3zgvTRH+PHYboDGVUzSUaks6ZtPYYfKn0CrTcb0cLpD6+0HrXW1oOVTWwyFS/0n3 sSwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=U68WKfV6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id az1-20020a056a02004100b00578ccb95206si4397353pgb.745.2023.10.06.14.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 14:44:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=U68WKfV6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 99F73821579E; Fri, 6 Oct 2023 14:44:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233726AbjJFVoW (ORCPT + 18 others); Fri, 6 Oct 2023 17:44:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233714AbjJFVoV (ORCPT ); Fri, 6 Oct 2023 17:44:21 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80535CA for ; Fri, 6 Oct 2023 14:44:20 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B99E6C433C8; Fri, 6 Oct 2023 21:44:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696628660; bh=DmsXWqZVA04oJx2004Lm5q2na1hsfJMHrU27+MQlR4Q=; h=From:To:Cc:Subject:Date:From; b=U68WKfV6UUALEGmGiUv81LMjFzEKXBUtsMinrOJe+TxRrdOStYpGbnAWdOVO27VvX wlLCrzV6Ak7Yh+xYaMRS/tnNc8J7anypiNC5JWDxcMK9PLqHD9yjTeXYm35JDIkkpb DFAtZ/X1CC+qghEaa6kBZU1SsB8SoLNiQ6hYj5ewJsfDwlHt+PbtDdifiI23Py+UAE Qw8Y7OhkRyI2fame18DqMYCXIOBh/m+UH2toHukBFBBgwcuJWtOakd5T1bEk9snX4w rt7kAl3jFR5xwUXm5EIqvgoRCLThYJaoizn1Rmj9Zv+sqCJWbuQwuok6yw3P6N9F14 gf14CDK9X4LwA== Received: (nullmailer pid 339385 invoked by uid 1000); Fri, 06 Oct 2023 21:44:18 -0000 From: Rob Herring To: Paul Burton , Miguel Ojeda Cc: linux-kernel@vger.kernel.org Subject: [PATCH] auxdisplay: img-ascii-lcd: Use device_get_match_data() Date: Fri, 6 Oct 2023 16:44:12 -0500 Message-Id: <20231006214412.339250-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 06 Oct 2023 14:44:27 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779044104172227918 X-GMAIL-MSGID: 1779044104172227918 Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Signed-off-by: Rob Herring --- drivers/auxdisplay/img-ascii-lcd.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c index fa23e415f260..c16a14becdfc 100644 --- a/drivers/auxdisplay/img-ascii-lcd.c +++ b/drivers/auxdisplay/img-ascii-lcd.c @@ -8,9 +8,9 @@ #include #include #include -#include -#include +#include #include +#include #include #include @@ -225,17 +225,12 @@ MODULE_DEVICE_TABLE(of, img_ascii_lcd_matches); */ static int img_ascii_lcd_probe(struct platform_device *pdev) { - const struct of_device_id *match; const struct img_ascii_lcd_config *cfg; struct device *dev = &pdev->dev; struct img_ascii_lcd_ctx *ctx; int err; - match = of_match_device(img_ascii_lcd_matches, dev); - if (!match) - return -ENODEV; - - cfg = match->data; + cfg = device_get_match_data(&pdev->dev); ctx = devm_kzalloc(dev, sizeof(*ctx) + cfg->num_chars, GFP_KERNEL); if (!ctx) return -ENOMEM;