From patchwork Fri May 14 21:33:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 438961 Delivered-To: patch@linaro.org Received: by 2002:a02:b78d:0:0:0:0:0 with SMTP id f13csp684247jam; Fri, 14 May 2021 14:34:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZICNiHzHrlr/2IQN+FkhN86XvfV3AeErYSQiWJiPUH7LU4yE5X4zuy/4vkzau9HcZtPE6 X-Received: by 2002:a05:6402:268c:: with SMTP id w12mr60576786edd.234.1621028048809; Fri, 14 May 2021 14:34:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621028048; cv=none; d=google.com; s=arc-20160816; b=NDbjV9DjdSRO+MzyPYR+jVa0dGsatMUFxEpA39Hr1AkZrptZ5tuMYMl87SjndOKgIH yX4mr89HIxWN+mjjyIQLktFR83cCfPjnpS6VkKtqlfuU2etzXNWb3Zxv92KFVSNtiq1c XmcmHRe7aHU5FRnPmE3dOW2utxdtwW7CWsMfAn60vM6hY++PeDb5cJPiGsnsfxFcA08Z JHTUxs6vJnBz4gQ3b9y2N1DgZqhi41kla7hC1kXpiVAhkMWV8++1Wv3aLIvO9PzFAelC modzTyPtKa7dizF/hWybCDVxZcUgNoQPBnoYZLi1+ePrsbcaO2iALKGHzs0EQCWkGwc/ n8cA== 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=+sm3lz9ksg6+Ign1zC3GVb6PrKHkH+OQ9vGrwKPc8ZU=; b=UhMNByD3zRhtxlsBv5CbA2NLhS3rHb3gPqp50Ef/j406c4//D4Vb4NnCW4LHIuinZ0 XiPN9tlqPDaTPUamoPxBFco6ktWvgdsA7NcOSK2JMTQSqv7xXD3Qq0ysNuHF2i2YKn4V xWw81pXqLQbiwms7fMjwgzKZBCVJ5e9ApMmTiW86SzvOqW2jano1mDmmzrdEoJKU6i3X xaMhqrDnZWzTtr5uacceQ63YjXD6k+ptcX4coGZGj2ZZ7M0UflfgH6eufOkNOn8EsS+l xGDXydZ5gNIwFtYutUpf4UvdssZPco/gKqgx+OJVc5PUP3wVqEodT3FbLbrqBq7n1Wgk y64g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cU1uvUz4; spf=pass (google.com: domain of linux-fbdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-fbdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u15si8045004edt.43.2021.05.14.14.34.08 for ; Fri, 14 May 2021 14:34:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-fbdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cU1uvUz4; spf=pass (google.com: domain of linux-fbdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-fbdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232375AbhENVfT (ORCPT ); Fri, 14 May 2021 17:35:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:56462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230475AbhENVfS (ORCPT ); Fri, 14 May 2021 17:35:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3D10E6143F; Fri, 14 May 2021 21:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621028046; bh=hJes5fVwFMyBeanoe97q1M/H0pXkUh5gZ9KDWMORWxE=; h=From:To:Cc:Subject:Date:From; b=cU1uvUz4dnLZFAGf0hBvsDMANh2A6Nn29EdaIlH2ApxigmLn5llJ2MOYkOge9CLiM DktbmKF0dGNg+xjxBwE/9nP4x3sxxyLiC2UoS6JsyewiIlBeIAQEDIDTf6RHkWbBrn gxiY3BwLVI7/kd8MdCaFARy4NR29rIYihzGAG3DXSUL/DXqhSdGvvOdbEKyvVL3zKh jq1Jh5+G5gRKCeYwqRHj562jd6FOOyEBq9GUgsD8h3n+S6Nwl3nUQp+boAdzMOwwZq WFqjZmp+YEqZs0gmwyzPn+34UkaOLtDznl44dXJprpQ/g5+r4B7io7jbWpAzSFMkJh fSd9/V+anuz3g== From: Arnd Bergmann To: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Arnd Bergmann , Geert Uytterhoeven , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] fbdev: matrox: use modern module_init() Date: Fri, 14 May 2021 23:33:05 +0200 Message-Id: <20210514213316.635070-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org From: Arnd Bergmann This is one of the last drivers with a global init_module() function instead of the modern module_init() annotation. Convert it over. Signed-off-by: Arnd Bergmann --- drivers/video/fbdev/matrox/matroxfb_base.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.29.2 diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c index 4325bf7f388c..5c82611e93d9 100644 --- a/drivers/video/fbdev/matrox/matroxfb_base.c +++ b/drivers/video/fbdev/matrox/matroxfb_base.c @@ -2486,8 +2486,6 @@ static int __init matroxfb_init(void) return err; } -module_init(matroxfb_init); - #else /* *************************** init module code **************************** */ @@ -2572,7 +2570,7 @@ module_param_named(cmode, default_cmode, int, 0); MODULE_PARM_DESC(cmode, "Specify the video depth that should be used (8bit default)"); #endif -int __init init_module(void){ +static int __init matroxfb_init(void){ DBG(__func__) @@ -2603,6 +2601,7 @@ int __init init_module(void){ } #endif /* MODULE */ +module_init(matroxfb_init); module_exit(matrox_done); EXPORT_SYMBOL(matroxfb_register_driver); EXPORT_SYMBOL(matroxfb_unregister_driver);