Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932156Ab0DBCpf (ORCPT ); Thu, 1 Apr 2010 22:45:35 -0400 Received: from nwd2mail11.analog.com ([137.71.25.57]:11391 "EHLO nwd2mail11.analog.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758120Ab0DBCpc (ORCPT ); Thu, 1 Apr 2010 22:45:32 -0400 X-IronPort-AV: E=Sophos;i="4.51,352,1267419600"; d="scan'208";a="14868063" Subject: [PATCH] IIO: struct iio_dev_attr should be defined as static. From: sonic zhang To: Jonathan Cameron CC: Linux Kernel , linux-iio Content-Type: text/plain Date: Fri, 2 Apr 2010 10:55:48 +0800 Message-ID: <1270176948.3847.1.camel@eight.analog.com> MIME-Version: 1.0 X-Mailer: Evolution 2.8.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1502 Lines: 44 Otherwise link errors "multiple definition of `iio_dev_attr_mode'" are reported when compile multiple different iio drivers with the same attribute name. Signed-off-by: Sonic Zhang --- drivers/staging/iio/sysfs.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h index e501e13..39d207e 100644 --- a/drivers/staging/iio/sysfs.h +++ b/drivers/staging/iio/sysfs.h @@ -95,16 +95,16 @@ struct iio_const_attr { .val2 = _val2 } #define IIO_DEVICE_ATTR(_name, _mode, _show, _store, _addr) \ - struct iio_dev_attr iio_dev_attr_##_name \ + static struct iio_dev_attr iio_dev_attr_##_name \ = IIO_ATTR(_name, _mode, _show, _store, _addr) #define IIO_DEVICE_ATTR_2(_name, _mode, _show, _store, _addr, _val2) \ - struct iio_dev_attr iio_dev_attr_##_name \ + static struct iio_dev_attr iio_dev_attr_##_name \ = IIO_ATTR_2(_name, _mode, _show, _store, _addr, _val2) #define IIO_CONST_ATTR(_name, _string) \ - struct iio_const_attr iio_const_attr_##_name \ + static struct iio_const_attr iio_const_attr_##_name \ = { .string = _string, \ .dev_attr = __ATTR(_name, S_IRUGO, iio_read_const_attr, NULL)} -- 1.6.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/