Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1322049ybz; Thu, 16 Apr 2020 07:11:45 -0700 (PDT) X-Google-Smtp-Source: APiQypIgLQDFp/1Tb58H+xEOLl3cYD9AZklWVFUN7F0PG8RDUkwrT2KZOyV246MSMBzO4C+Woziz X-Received: by 2002:aa7:c597:: with SMTP id g23mr11392205edq.109.1587046305792; Thu, 16 Apr 2020 07:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587046305; cv=none; d=google.com; s=arc-20160816; b=nFofuZMvI4TqAuMGm1ipytDRnNpi3CTbdq/ozbbahGkyTTDSUwrFRsw8Y9qphcxzoT k9P8MUF7uIdXsoxf/HI9KxPByf/8CddrHkw6FlUPJ2+6vSsfHhmOqAYI6U4/jzQXyeCq mShrf/ENXoiwb6AAu3/ddVuDAl8g6XdsY/ZJJgCpVRg99C7oPoS1SySdlUL0EDqNPo/9 nbXWZycTdFF2rWVBRrYpajXYsIEqQgf1Zo4OxLPcuyhQC5jjaxb4MjYxNFT7Hn/+OYNn PH3Mev9pas5F04V6tl0uMHbpcxG5yh84QstAqEuDtrhmBXu9bnypRk1rSdkvz2AFRAfo 63hQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RS3d9RwULJbiKVQn5FcNII8+gpccSDqDVpaKwZQg71E=; b=Y9UpYqXP1Pa+5nDWG3Ot6m18cxIDxJpMuydcya+uhUTlXbRdxqObVxlENPiQJd26Oo /uvok5NGRq7TBb+kCNofAznacRkosw0+EqCgteLvP7e4RhWbocRJ+JZgksvxKmCBDRBv lrnrL1eu20/c5NXhF5AmqnOxyr7hsvb/dD8grganCf3/GEskNx/+QY6Bq+N0N5YIGq3Y 3Y9McbT7auqT2uNaTPStrxL2NrX5LnZeZJHoLO25WC4BHbnJzAZd3EY06jrnIXS1cFFi 4OOkdGcaf9LufsB1RPn4mcue02Up4IJLPA5yeYqw7XErgXTxAoJO6I42xC6oSt2ZK3dT WDzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0oZYrZUO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pv24si12741564ejb.244.2020.04.16.07.11.15; Thu, 16 Apr 2020 07:11:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=default header.b=0oZYrZUO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388479AbgDPOIc (ORCPT + 99 others); Thu, 16 Apr 2020 10:08:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:59360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2898536AbgDPNpp (ORCPT ); Thu, 16 Apr 2020 09:45:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C119C208E4; Thu, 16 Apr 2020 13:45:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587044745; bh=MnuWYLFkdb1YHimhXS6d0CxSVI1WAlx/FlXUz917YfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0oZYrZUOCqCRVCUDvkB2RGwEeRLZyR+VFLKldPXvETv8ma29C+1wYO9UynZRmo/DJ cpfLJvBZIZOF3nSHDRos61PCBU5WM/yrSjzV7ctQjzImfC6h25grFJjKPNOVpC8xYb 2opyLVYogVknPEUMEQl2E0pqZjqvPPQYrv1RvVDk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, rdunlap@infradead.org, Matt Ranostay , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.4 047/232] media: i2c: video-i2c: fix build errors due to imply hwmon Date: Thu, 16 Apr 2020 15:22:21 +0200 Message-Id: <20200416131321.642130238@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131316.640996080@linuxfoundation.org> References: <20200416131316.640996080@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matt Ranostay [ Upstream commit 64d4fc9926f09861a35d8f0f7d81f056e6d5af7b ] Fix build fault when CONFIG_HWMON is a module, and CONFIG_VIDEO_I2C as builtin. This is due to 'imply hwmon' in the respective Kconfig. Issue build log: ld: drivers/media/i2c/video-i2c.o: in function `amg88xx_hwmon_init': video-i2c.c:(.text+0x2e1): undefined reference to `devm_hwmon_device_register_with_info Cc: rdunlap@infradead.org Fixes: acbea6798955 (media: video-i2c: add hwmon support for amg88xx) Signed-off-by: Matt Ranostay Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/video-i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index 078141712c887..0b977e73ceb29 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -255,7 +255,7 @@ static int amg88xx_set_power(struct video_i2c_data *data, bool on) return amg88xx_set_power_off(data); } -#if IS_ENABLED(CONFIG_HWMON) +#if IS_REACHABLE(CONFIG_HWMON) static const u32 amg88xx_temp_config[] = { HWMON_T_INPUT, -- 2.20.1