From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226+iw95O6wqSVQei+/B3JAZqetBt1afP/Oa96wvvUsjSglNBj3PNTOHc8OuFF0weCAPb4CJ ARC-Seal: i=1; a=rsa-sha256; t=1516636908; cv=none; d=google.com; s=arc-20160816; b=f3LcaTDoAtgii14WUehxpaS/6JvnX+9/tgqu+vo+uomXOKuCbkoxzIje6mU/tuiMWO oKnr/INBabKt2PbfcCABG0N6jFiyOhkCo4x4UlY1dH6Z4fmoMG1/t0ncUxqu+l2VShdw VeNsGMS92TYbxsDlXXvIgHs9ndKxE1EgPR1lMQHrMey0+tBDMqe5EyQEA3MTqZ8bPtX2 z0fCrJuj8lZUv12dhOaq1g3hhBb/e7Gya8hv1bLizvfu7nJvreORyX0Obbuu0+qxqJxo xuqjIL24F4WzBJQS7paqvTfBwoCbM40CVmXQ49RjKmWliFL3c4OOv6BVl3JCmJ3Op09Z GwSQ== 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=TlIOeLl16+uCCNKNd8qsPjdbc+1CEwskMDqBCRO3ywM=; b=U4H/ruFpf+sY0VXs6cbxc8ylvOBq7lkvhLxFJQVrOywMTTOz11FW7tSBeFVE4m5wOe SQvxY/crP3iOHWrvMtXpRQ/+0MAADXBorpm98Qyw+so265ymGoJ4ZRCmyU7fbgfp+MTx MLj68q4z0ADnIzNTYycg2jM+sPjDwO0YAbe9+K308y79SmasbLaclL95Z9//bj2dIMQT 8fLvPUpmtAcFQb/qUPzzzM+gOqryMTFwDf/g7Xcj9yxkg37h+q3pN0Y30wIC6rECy9p+ 5hO93L7h+UX2WpTRLLVi7YMxfnJr9E03q8bIzl16SlnJLupnOa6K49Bfd1eNPalpSRlN ViaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of andriy.shevchenko@linux.intel.com designates 134.134.136.20 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 134.134.136.20 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="13172181" 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 v2] device property: Define type of PROPERTY_ENRTY_*() macros Date: Mon, 22 Jan 2018 18:01:42 +0200 Message-Id: <20180122160142.12515-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?1590309063431626117?= X-GMAIL-MSGID: =?utf-8?q?1590309063431626117?= 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 { Acked-by: Corey Minyard Cc: Corey Minyard Signed-off-by: Andy Shevchenko --- - add Ack - rebase on non-custom tree 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 f6189a3ac63c..2e3a7c24659e 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -206,7 +206,7 @@ struct property_entry { */ #define PROPERTY_ENTRY_INTEGER_ARRAY(_name_, _type_, _val_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ .length = ARRAY_SIZE(_val_) * sizeof(_type_), \ .is_array = true, \ @@ -224,7 +224,7 @@ struct property_entry { PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u64, _val_) #define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ .length = ARRAY_SIZE(_val_) * sizeof(const char *), \ .is_array = true, \ @@ -233,7 +233,7 @@ struct property_entry { } #define PROPERTY_ENTRY_INTEGER(_name_, _type_, _val_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ .length = sizeof(_type_), \ .is_string = false, \ @@ -250,7 +250,7 @@ struct property_entry { PROPERTY_ENTRY_INTEGER(_name_, u64, _val_) #define PROPERTY_ENTRY_STRING(_name_, _val_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ .length = sizeof(_val_), \ .is_string = true, \ @@ -258,7 +258,7 @@ struct property_entry { } #define PROPERTY_ENTRY_BOOL(_name_) \ -{ \ +(struct property_entry) { \ .name = _name_, \ } -- 2.15.1