Commit 95d617b4 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Lee Jones
Browse files

mfd: intel_msic: Use DEFINE_RES_IRQ() macro 



Instead of open coding each data structure with IRQ resources,
use dedicated macro.

In one case use DEFINE_RES_IRQ_NAMED() and DEFINE_RES_MEM_NAMED().

No functional change intended.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 86f955d2

drivers/mfd/intel_msic.c

+10 −34
Original line number Diff line number Diff line
@@ -54,68 +54,44 @@ struct intel_msic { 
};



static struct resource msic_touch_resources[] = {

	{

		.flags		= IORESOURCE_IRQ,

	},

	DEFINE_RES_IRQ(0),

};



static struct resource msic_adc_resources[] = {

	{

		.flags		= IORESOURCE_IRQ,

	},

	DEFINE_RES_IRQ(0),

};



static struct resource msic_battery_resources[] = {

	{

		.flags		= IORESOURCE_IRQ,

	},

	DEFINE_RES_IRQ(0),

};



static struct resource msic_gpio_resources[] = {

	{

		.flags		= IORESOURCE_IRQ,

	},

	DEFINE_RES_IRQ(0),

};



static struct resource msic_audio_resources[] = {

	{

		.name		= "IRQ",

		.flags		= IORESOURCE_IRQ,

	},

	DEFINE_RES_IRQ_NAMED(0, "IRQ"),

	/*

	 * We will pass IRQ_BASE to the driver now but this can be removed

	 * when/if the driver starts to use intel_msic_irq_read().

	 */

	{

		.name		= "IRQ_BASE",

		.flags		= IORESOURCE_MEM,

		.start		= MSIC_IRQ_STATUS_ACCDET,

		.end		= MSIC_IRQ_STATUS_ACCDET,

	},

	DEFINE_RES_MEM_NAMED(MSIC_IRQ_STATUS_ACCDET, 1, "IRQ_BASE"),

};



static struct resource msic_hdmi_resources[] = {

	{

		.flags		= IORESOURCE_IRQ,

	},

	DEFINE_RES_IRQ(0),

};



static struct resource msic_thermal_resources[] = {

	{

		.flags		= IORESOURCE_IRQ,

	},

	DEFINE_RES_IRQ(0),

};



static struct resource msic_power_btn_resources[] = {

	{

		.flags		= IORESOURCE_IRQ,

	},

	DEFINE_RES_IRQ(0),

};



static struct resource msic_ocd_resources[] = {

	{

		.flags		= IORESOURCE_IRQ,

	},

	DEFINE_RES_IRQ(0),

};



/*