From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vern.gendns.com ([206.190.152.46]:55256 "EHLO vern.gendns.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753312AbeD0Der (ORCPT ); Thu, 26 Apr 2018 23:34:47 -0400 From: David Lechner To: stable@vger.kernel.org Cc: David Lechner , Hans de Goede , Johan Hovold , Sebastian Reichel , Greg Kroah-Hartman Subject: [PATCH] tty: serdev: fix missing static modifier on DEVICE_ATTR_RO(modalias) Date: Thu, 26 Apr 2018 22:33:58 -0500 Message-Id: <20180427033358.13167-1-david@lechnology.com> Sender: stable-owner@vger.kernel.org List-ID: This fixes the compile error "multiple definition of `dev_attr_modalias'" by adding the static modifier to DEVICE_ATTR_RO(modalias). This change was made in the mainline kernel in 2460942f51f1 ("serdev: do not generate modaliases for controllers") along with some other changes. Fixes: 4fe99816a1ab ("tty: serdev: use dev_groups and not dev_attrs for bus_type") Cc: Hans de Goede Cc: Johan Hovold Cc: Sebastian Reichel Cc: Greg Kroah-Hartman Cc: # 4.14.x Signed-off-by: David Lechner --- Should we pick up the patch 2460942f51f1 ("serdev: do not generate modaliases for controllers") for stable or is this patch good enough? drivers/tty/serdev/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c index 97db76afced2..25298b7b2419 100644 --- a/drivers/tty/serdev/core.c +++ b/drivers/tty/serdev/core.c @@ -276,7 +276,7 @@ static ssize_t modalias_show(struct device *dev, { return of_device_modalias(dev, buf, PAGE_SIZE); } -DEVICE_ATTR_RO(modalias); +static DEVICE_ATTR_RO(modalias); static struct attribute *serdev_device_attrs[] = { &dev_attr_modalias.attr, -- 2.17.0