From patchwork Fri Jul 21 13:13:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 123864 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp218939vqg; Fri, 21 Jul 2023 06:51:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlE5RuHXVbn7cq6rwxZOvf9OQ8t3hG9G0CPBs5pNf2GddWk04wPNMSmSGCoH0ymiyQTZxerL X-Received: by 2002:a05:6a20:2444:b0:126:43f7:e271 with SMTP id t4-20020a056a20244400b0012643f7e271mr1868477pzc.39.1689947470458; Fri, 21 Jul 2023 06:51:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689947470; cv=none; d=google.com; s=arc-20160816; b=VtwNuTvLU5eew+1p0JE8skv93O+sVDmBwspJ6Ts9Q+wVHebwLaGcc2jMbbsq+TMzwk Sr6FYHwAwOFl0NMvdQc7zCih2JZNsMvpKobW44OaAyzpLMiWBTldJdLh7HsBrTOmnlvq O+IwkTLmN+6gi2KBraiAvyITVZgdDFzUkH1MSIa0hhdQbVYH3qfiYiSHAhkkwKjRcDKj TnWiO+I/RPhVSkGD8+TGBdXLfUlFb+FhXzB2KycXBS3HvIVaerdUiPiVgbCdJwKwWUts DTyXPrBl4G8QVAKfSLHRDtEQSzZ5str1nr6WG7gck0ezNkpcVopyztrEuDSx5sA7CxO2 b5OQ== 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=7cDOfSpgPY9UlkfY+894bi9x1siAYm6tREvGA8DpNL0=; fh=ljmjV39CZHdx7qIiWFTZlGr3lAqWoqyGq/czxfT53YY=; b=OdVgReMvs9Kap2LpoIYFRR6zaYW6v/ApJt07xdlNt0vCwgjvny726Vo6ybnTdXF9cJ j/McFUdTl1RuqB8kYHsJcxxMyMq/ZLoZ8mW1JFKJ52ulAJCy1BLHI8jHrjCf1mcskSVd VYSQQl2VmzplLQz66UI7daqCXumroNdUAZU6ZqPD0TSj71E7SZT6Yl8FuNqM1y6O+vvQ QFbQ5ybMIRrZRt2w+uip9DeCfDGntsu/Z2cSsjOoFEBLvTOHYLlaZdWaHZArTqfof684 CG+G9g9YHbbno5Ycu0hmU1BchnoMvqsvAlLkUe659ulnxdJrvd0yEog2X96fZsJntxpK ynkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=J9pyo7Ne; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t11-20020a170902e1cb00b001bb40b900d0si2877611pla.100.2023.07.21.06.50.54; Fri, 21 Jul 2023 06:51:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=J9pyo7Ne; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230180AbjGUNNH (ORCPT + 99 others); Fri, 21 Jul 2023 09:13:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229656AbjGUNNG (ORCPT ); Fri, 21 Jul 2023 09:13:06 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31F9CE68 for ; Fri, 21 Jul 2023 06:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689945185; x=1721481185; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=vg8rWD7w0qiY2FAJ7+yQ72xVtJTy03qbBGWXgMhMiaU=; b=J9pyo7NeNF7pWoYNilppok7F9GUXhTBQ9t5VfdpKfv8Nc+RMIJV8we49 +eAjlDaEbySj8qdEVT5EoxIOMrXxOH0/B32e+BRcyoFrcPFDbdc+vlVfL B3J7hSo1MdqjcGjNPeKa5CqD6aVovOzVYSfA66iZ9wdZzOQwTRh4l2Lzl C4DWb/LHAEdT7kO7U0S8U6dkkfZqxaJP+PhRVon7StqZbzsRdZrH2SBM5 62xvVs8wqTfbVVbwM2Yj7jwQBsqUOzRUCEz14zcvkQHSEeARRf3wiOWWo bsWfSV4x+wYhghHQFKIJjgDrQafcfqQsfNO+REBFXDLqRlNOYzzNg8nHk g==; X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="364481804" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="364481804" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 06:13:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10777"; a="724867908" X-IronPort-AV: E=Sophos;i="6.01,220,1684825200"; d="scan'208";a="724867908" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 21 Jul 2023 06:13:03 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 98012370; Fri, 21 Jul 2023 16:13:10 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: Andi Shyti Subject: [PATCH v1 1/1] driver core: Move dev_err_probe() to where it belogs Date: Fri, 21 Jul 2023 16:13:09 +0300 Message-Id: <20230721131309.16821-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772038359188279679 X-GMAIL-MSGID: 1772038359188279679 dev_err_probe() belongs to the printing API, hence move the definition from device.h to dev_printk.h. There is no change to the callers at all, since: 1) implementation is located in the same core.c; 2) dev_printk.h is guaranteed to be included by device.h. Signed-off-by: Andy Shevchenko Reviewed-by: Andi Shyti --- include/linux/dev_printk.h | 2 ++ include/linux/device.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/dev_printk.h b/include/linux/dev_printk.h index 8904063d4c9f..6bfe70decc9f 100644 --- a/include/linux/dev_printk.h +++ b/include/linux/dev_printk.h @@ -274,4 +274,6 @@ do { \ WARN_ONCE(condition, "%s %s: " format, \ dev_driver_string(dev), dev_name(dev), ## arg) +__printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); + #endif /* _DEVICE_PRINTK_H_ */ diff --git a/include/linux/device.h b/include/linux/device.h index 6731d7dc1a2a..2ee6023b427a 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1241,8 +1241,6 @@ void device_link_remove(void *consumer, struct device *supplier); void device_links_supplier_sync_state_pause(void); void device_links_supplier_sync_state_resume(void); -__printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); - /* Create alias, so I can be autoloaded. */ #define MODULE_ALIAS_CHARDEV(major,minor) \ MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor))