From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224r0iutakyNI1zjNb4Srm3FmtjnD6H6ZCcE+7PaYIJKOrsMYyz6q9xbbBmICTWb2qgAMaqm ARC-Seal: i=1; a=rsa-sha256; t=1516635202; cv=none; d=google.com; s=arc-20160816; b=SxA4K9iQSS18iJrvYZqOk9tXW1EfGzmdj+AVLfGBT4B+5GVRvL4koY578shUT5krdD ErleKDKxx3K3D5B/WRMo9109JeTLj7S3gcsiLeD4F3W5Z2mCECK1qTdXU0F6nYKv5Z0v udGm9q5PY5cEv6spmbqnyBdfgzijF2d2F65HcPZYmUvxhwKh1ScLz90P+XIXadXkw3Op 9wzjLmwz5vBGdSYN6l9RhhI/Nj/tpddPg2aYWod18ApT+uVjn2h94rmfDVk9Yp2B2dZo v72t4fvP7dMkKvmCABnr1MOfbvHVjsGiOGZQSfPLrrk3MLAFgsUznYh/JSucGIpl3hNc UGcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=Y5URzuYIFjtKeYCog1A2t6FvG7aIw1HSb2ZtMtJEOkg=; b=uYJdHQUyA+NcYJnWU5rlWtMiREwntuRTuylpyL2PMzpr2/RxngcgJQIwDUwbOneFBS PBdzDmCNjmQq8/1OMn1wyZmbo/xPTDdNHj7PQSjOh3hKzdYOQqQY86ZXL5sljV7xsGRC S61DSDBWl1N8ZQmRkQeq1eFiKDtZD/PYM6l1P7guihSyC+Xnv+WM2ynwbaaIeSTourbN J6FdEDnZR/gpznzhE9S3v+9DPv0Pb6DeGQDK+zCF1PdD335vfCA2HF+geb6VVKj9MeZ5 5J0PluOFb9/27LKIYYxmHHzWbR6n5jK5gUHEgCp/V3JDlkX3YxuDF8vwpdMySOr85Ue5 Scnw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of andriy.shevchenko@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=andriy.shevchenko@linux.intel.com Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of andriy.shevchenko@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=andriy.shevchenko@linux.intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,397,1511856000"; d="scan'208";a="23708102" From: Andy Shevchenko To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, "Rafael J . Wysocki" , Sakari Ailus , mika.westerberg@linux.intel.com Cc: Andy Shevchenko , Corey Minyard Subject: [PATCH v1] device property: Define type of PROPERTY_ENRTY_*() macros Date: Mon, 22 Jan 2018 17:33:17 +0200 Message-Id: <20180122153317.75509-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.15.1 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590307273946588959?= X-GMAIL-MSGID: =?utf-8?q?1590307273946588959?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Some of the drivers may use the macro at runtime flow, like struct property_entry p[10]; ... p[index++] = PROPERTY_ENTRY_U8("u8 property", u8_data); In that case and absence of the data type compiler fails the build: drivers/char/ipmi/ipmi_dmi.c:79:29: error: Expected ; at end of statement drivers/char/ipmi/ipmi_dmi.c:79:29: error: got { Cc: Corey Minyard Signed-off-by: Andy Shevchenko --- include/linux/property.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/property.h b/include/linux/property.h index 7eefaf2f22b9..f144be4f99e0 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -204,7 +204,7 @@ struct property_entry { */ #define PROPERTY_ENTRY_INTEGER_ARRAY(_name_, _type_, _Type_, _val_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ .length = ARRAY_SIZE(_val_) * sizeof(_type_), \ .is_array = true, \ @@ -222,7 +222,7 @@ struct property_entry { PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u64, U64, _val_) #define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ .length = ARRAY_SIZE(_val_) * sizeof(const char *), \ .is_array = true, \ @@ -231,7 +231,7 @@ struct property_entry { } #define PROPERTY_ENTRY_INTEGER(_name_, _type_, _Type_, _val_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ .length = sizeof(_type_), \ .type = DEV_PROP_##_Type_, \ @@ -248,7 +248,7 @@ struct property_entry { PROPERTY_ENTRY_INTEGER(_name_, u64, U64, _val_) #define PROPERTY_ENTRY_STRING(_name_, _val_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ .length = sizeof(_val_), \ .type = DEV_PROP_STRING, \ @@ -256,7 +256,7 @@ struct property_entry { } #define PROPERTY_ENTRY_BOOL(_name_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ } -- 2.15.1