Received: by 10.213.65.68 with SMTP id h4csp2318037imn; Mon, 9 Apr 2018 01:09:22 -0700 (PDT) X-Google-Smtp-Source: AIpwx49TR9xMfPCL0OBmzOXyli056bOa1NTy4R8MGFduV2MXapJWmQ9FLyZlrwRnVqfK0G2GUoTH X-Received: by 10.98.105.2 with SMTP id e2mr28515107pfc.1.1523261362163; Mon, 09 Apr 2018 01:09:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523261362; cv=none; d=google.com; s=arc-20160816; b=XZoRlJZReV+HNsS30tuvTDiMO8kwgMFb8T6mC0AbL/w91P5kJ5eHGF8Mqk8lZD484o QLi9+rQK/DaKlhO/jlfJCIY3s8ElsvzF4GQc/SyGXJESdFZubpQJwgFPj7n9CIRCstsH PAHP3oCILgAOiS6v7oQzyqT1q0XKBm6zcvCR5Yn/F0MnG3qoudCsaj/epDAuhhaqIHKT WlfEA7PG3K8MT+J57LzOKB7AB7DgM4wyHde8jDLnBDNnd4W9m72F9028704kwG6bVz/6 bABDVq/8gp1Th1sbjVBP3UWoI6S/UXm/zz6LG9LvxsYbgYG+xQPHR5RR9ZxkK1r/0NUK bySw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=qSiARZbZRngDlxoz1mn16m323zicXekSYsEU5fwx2IQ=; b=heYybc1qrYf9qp3hbQsjv1f9IknG3sIoVZewCkKOdRiMoIWI7ExVXPyEZ/6Q2L72rM Z+NCadt1lplhi48XtdaZ93f+LdQtYLnxlrQxcdvlwzoM4jiTx8y5JFI2fU7M8hScQ3RZ CjDYLTXgA4pCBcxo1URiU3UWWKa50ekJsC22Emis/rSVFO8NBin1GamHXqTAm8ZajLSQ ky8eayFq2L8jfasEn3jaf48Fii7AbU+3nle3Xoc6qv2MgCLi4tfkXSaEpRzNba9hpdyI ILNZJAiXazy/iXGaj4HNpZsXQtr26N+ML7Uv72yDuMK7CDiorCrJPy7fjm3zD1OjDltr HVpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=cSZI8NnC; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y7-v6si14071611plh.583.2018.04.09.01.08.45; Mon, 09 Apr 2018 01:09:22 -0700 (PDT) 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; dkim=pass header.i=@gmail.com header.s=20161025 header.b=cSZI8NnC; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752178AbeDIIFA (ORCPT + 99 others); Mon, 9 Apr 2018 04:05:00 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33919 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750759AbeDIIE6 (ORCPT ); Mon, 9 Apr 2018 04:04:58 -0400 Received: by mail-wm0-f68.google.com with SMTP id w2so16518826wmw.1; Mon, 09 Apr 2018 01:04:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=qSiARZbZRngDlxoz1mn16m323zicXekSYsEU5fwx2IQ=; b=cSZI8NnCBtHRtpY39HR474/CiwxaEtl0yOifUNEOiO6Fl4VwUlEyIMYC0k9851/dh9 Hw4oaEp8KcaYMujzLSAt/l6+nkN3tD5a1CfzVeesiohxm7BTQ7PDgMgtLxKZxGlladRZ +XAwl3MgQycIOaYVvNdaKFFEleu/881DCEk1JthuU7gMuIsFqMjxpVwz+OwubcmPPduy 0t+4cccR/tOtCS98fUfblrSgUlmIVAxkOQ1FWOHGMxoX1/cT8ZuGbNZatqSnQtCRafIy mBqeAM7MQxTfSn8TGoMrymT2XWSAD7QuR3Oucg/c9CsBYaCT44lr7urENG+RjcPqrj7y BFlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qSiARZbZRngDlxoz1mn16m323zicXekSYsEU5fwx2IQ=; b=DEwE5XeBvxcTqd59tFoDcaCAEm/++WXiUjQaUPu520a2O8B8WuQVMkMSVqoivCeMAH YHFeRnWKc40oWs35d6ldbwAU8NGOWBJCzHpyVXrdHrfUbgH5rirAa+h5HnJ5Cv9WgH5T JvAEwKKjE9J+c2I3v3CKHyjwitphyLWGuqhsaS0t8SlLAcELHX6jK5F3sqQXPAN/P1TF bvdSg8LOHzoL8Q9nweCH3V1kg9g05fvzxh57b3h/sJ4hplrRsz+fgQ4jipBVg++3GK6/ NXIs1a4la0IvRg7KfGBp3vsVHFdM31oiH1P2FQ/9ym73GiENDZrvr695tb3KkTLV1Sa6 teOQ== X-Gm-Message-State: AElRT7E3lj16AaSg0pA6S6nmlYO15UZL5j89xLAxq4ZtPSWn+QSbHTj/ w2pddGSPMmZQMByNgverYYM= X-Received: by 10.28.109.80 with SMTP id i77mr17817950wmc.46.1523261097434; Mon, 09 Apr 2018 01:04:57 -0700 (PDT) Received: from [127.0.1.1] ([83.243.48.51]) by smtp.gmail.com with ESMTPSA id u196sm77503wmf.30.2018.04.09.01.04.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Apr 2018 01:04:56 -0700 (PDT) From: Tobias Regnery To: heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tobias Regnery Subject: [PATCH] usb: typec: ucsi: fix tracepoint related build error Date: Mon, 9 Apr 2018 09:55:17 +0200 Message-Id: <20180409075517.15362-1-tobias.regnery@gmail.com> X-Mailer: git-send-email 2.16.3 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ucsi driver defines several tracepoints, but the header file with the tracepoint definition trace.h is only conditionally built depending on CONFIG_FTRACE. This leads to the following build error with CONFIG_FTRACE=n and CONFIG_TYPEC_UCSI=m: ERROR: "__tracepoint_ucsi_command" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_register_port" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_notify" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_reset_ppm" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_run_command" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_ack" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! ERROR: "__tracepoint_ucsi_connector_change" [drivers/usb/typec/ucsi/typec_ucsi.ko] undefined! With CONFIG_TYPEC_UCSI=y the build fails with several link errors. Fix this by changing the Makefile to unconditionally build trace.o. Tracepints are a runtime contruct and no other user of tracepoints depends on CONFIG_FTRACE. Fixes: c1b0bc2dabfa ("usb: typec: Add support for UCSI interface") Signed-off-by: Tobias Regnery --- drivers/usb/typec/ucsi/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/usb/typec/ucsi/Makefile b/drivers/usb/typec/ucsi/Makefile index b57891c1fd31..971befbbc2a8 100644 --- a/drivers/usb/typec/ucsi/Makefile +++ b/drivers/usb/typec/ucsi/Makefile @@ -3,8 +3,6 @@ CFLAGS_trace.o := -I$(src) obj-$(CONFIG_TYPEC_UCSI) += typec_ucsi.o -typec_ucsi-y := ucsi.o - -typec_ucsi-$(CONFIG_FTRACE) += trace.o +typec_ucsi-y := ucsi.o trace.o obj-$(CONFIG_UCSI_ACPI) += ucsi_acpi.o -- 2.16.3