From patchwork Mon Nov 11 22:15:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 11237947 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7563F14E5 for ; Mon, 11 Nov 2019 22:15:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48CC72184C for ; Mon, 11 Nov 2019 22:15:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="n4mFGJJx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48CC72184C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=pFswZiv43udelBs3IhSgFqFSz9z2+YYBx3udxd6P0Eg=; b=n4mFGJJx6TWCpb loVOdFM0xfAPteN/iaCYa1N4Y3bEG9040ESl9C01CqoPqTaxeM4zxgKHMSCbS0ZS7+Mbel+yMUeqo JyLD2FBPMcPKH1XeS1hRcfk+l211Drm9WWFlP1QkvVWCOZirPMfmjQ0ve++CLq5km3uSAqghbWXkQ rosvyKthJfJx+uVavqKTNETV9ztydjsOZzFgoQ6EDvSaD4ByUr24csmJkuS4hHTTzQS5Zoq8Jaypv yQdhHtPcAQWLg7EedLoVRE7r+xvRoBSJ/mJJZNEYIkNI3i86mjqgNfGNsD3CX+mqEtteoSZDHjhYJ l+/QQZHzem5iELuPxPfA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUHyA-0007Av-Rx; Mon, 11 Nov 2019 22:15:34 +0000 Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUHy8-0007AA-BH; Mon, 11 Nov 2019 22:15:33 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0439DAC52; Mon, 11 Nov 2019 22:15:29 +0000 (UTC) From: =?utf-8?q?Andreas_F=C3=A4rber?= To: linux-amlogic@lists.infradead.org Subject: [PATCH] soc: amlogic: socinfo: Avoid soc_device_to_device() Date: Mon, 11 Nov 2019 23:15:21 +0100 Message-Id: <20191111221521.1587-1-afaerber@suse.de> X-Mailer: git-send-email 2.16.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191111_141532_532877_DF7BC120 X-CRM114-Status: GOOD ( 10.59 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [195.135.220.15 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , Martin Blumenstingl , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Kevin Hilman , =?utf-8?q?Andreas_F=C3=A4rber?= , linux-arm-kernel@lists.infradead.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org The helper soc_device_to_device() is considered deprecated. For a driver __init function the predictable prefix text "soc soc0:" from dev_info() does not add real value, so use pr_info() to emit the info text without such prefix. While at it, normalize the casing of "detected" for GX. Cc: Greg Kroah-Hartman Cc: Martin Blumenstingl Cc: Neil Armstrong Signed-off-by: Andreas Färber --- drivers/soc/amlogic/meson-gx-socinfo.c | 4 +--- drivers/soc/amlogic/meson-mx-socinfo.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c index 01fc0d20a70d..105b819bbd5f 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -129,7 +129,6 @@ static int __init meson_gx_socinfo_init(void) struct device_node *np; struct regmap *regmap; unsigned int socinfo; - struct device *dev; int ret; /* look up for chipid node */ @@ -192,9 +191,8 @@ static int __init meson_gx_socinfo_init(void) kfree(soc_dev_attr); return PTR_ERR(soc_dev); } - dev = soc_device_to_device(soc_dev); - dev_info(dev, "Amlogic Meson %s Revision %x:%x (%x:%x) Detected\n", + pr_info("Amlogic Meson %s Revision %x:%x (%x:%x) detected\n", soc_dev_attr->soc_id, socinfo_to_major(socinfo), socinfo_to_minor(socinfo), diff --git a/drivers/soc/amlogic/meson-mx-socinfo.c b/drivers/soc/amlogic/meson-mx-socinfo.c index 78f0f1aeca57..7db2c94a7130 100644 --- a/drivers/soc/amlogic/meson-mx-socinfo.c +++ b/drivers/soc/amlogic/meson-mx-socinfo.c @@ -167,8 +167,8 @@ static int __init meson_mx_socinfo_init(void) return PTR_ERR(soc_dev); } - dev_info(soc_device_to_device(soc_dev), "Amlogic %s %s detected\n", - soc_dev_attr->soc_id, soc_dev_attr->revision); + pr_info("Amlogic %s %s detected\n", + soc_dev_attr->soc_id, soc_dev_attr->revision); return 0; }