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: 179159 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7265007ilf; Mon, 11 Nov 2019 14:15:40 -0800 (PST) X-Google-Smtp-Source: APXvYqyiqWManV6TQrISnU5dZJCfm61GxMQp+kBZvLqvdCpzJFtuzqIK+yiVoG+PuHKTYvr4J97U X-Received: by 2002:a17:907:110f:: with SMTP id qu15mr25194188ejb.179.1573510540339; Mon, 11 Nov 2019 14:15:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573510540; cv=none; d=google.com; s=arc-20160816; b=rL8d5fBQWzKJJpooMWJkntj1Tls4ieMneGxWlTBHZPPWa/UGhFlSTggDwXQUAhuSvm 2DJhwMbXan/T4UnIqOv0nZzAZRboOluLne9q0CLSoNDvrGBvv1tyujo+7X5gWbIEnUei EbcdDjwE8/9l17EJuXes4PG1z1tgFCMYn7McY1Ul3R57S4W57lPEp9hoYokoqY34H75p cGUTzrbycCX96CK5h+IrWvufHUnRGJcN2HOGDvEDFizS36M5jzaPPu4S6dthLS7mwyXX 8+4ZvUtxt+JquXyWF/+UNbBmMvnq2HNXr4afe/z5YapLSusirIT8Bn6AxeV3glkgDBc3 9/1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=0fWdRjkklmabtGEvZEc0ncbWmsqMsZamstx2wPxlrHA=; b=Au/mCYDyaI3lnkaMGOHIgBAmeP3BRDI3xYOXAeLWkyLT76mmAyrSq+q8GiAgkBGDDU vwc8XdF5NzEX+fK6LRdmcKYqD+XGg8IeqRVTPTz/Fvxx4vbNXxagEkKZzjvIrJkEWI2m 5TMCXeMthm7YMYm1zvIXxSR6nOaS0dXY5ndjj6CPVHXwWntABdTPRIxfOf7xJcO+i1zP PlY1sTarF+gka/LHnVAug5I/FHskOW79eS78UxqhPOloX8EVHKSkJJOwDr8yAxYzj0HH Y9soNFKf2D+cu1V8h2ZIAL5oLQY/s/Cvs8ULXVJIoLixN01Qybrk5D587Eknr5JB+0E/ HBGw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d14si10568209ejc.72.2019.11.11.14.15.40; Mon, 11 Nov 2019 14:15:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727247AbfKKWPf (ORCPT + 26 others); Mon, 11 Nov 2019 17:15:35 -0500 Received: from mx2.suse.de ([195.135.220.15]:55802 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726939AbfKKWPb (ORCPT ); Mon, 11 Nov 2019 17:15:31 -0500 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 Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andreas_F=C3=A4rber?= , Greg Kroah-Hartman , Martin Blumenstingl , Neil Armstrong , Kevin Hilman 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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(-) -- 2.16.4 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; }