From: rmallon@gmail.com (Ryan Mallon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: ep93xx: use DEFINE_RES_* macros
Date: Wed, 11 Apr 2012 12:06:58 +1000 [thread overview]
Message-ID: <4F84E742.6030507@gmail.com> (raw)
In-Reply-To: <201203211135.49295.hartleys@visionengravers.com>
On 22/03/12 05:35, H Hartley Sweeten wrote:
> Use the DEFINE_RES_* macros to reduce some of the boilerplate code.
>
> Signed-off-by: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Ryan Mallon <rmallon@gmail.com>
> Cc: Mika Westerberg <mika.westerberg@iki.fi>
Applied (with Mika's ack) to ep93xx-cleanup branch on
https://github.com/RyanMallon/linux-ep93xx.
I won't do an official announcement of the repo yet, but hopefully that
branch will remain stable :-).
Thanks,
~Ryan
>
> ---
>
> diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
> index 8d25895..a2cb176 100644
> --- a/arch/arm/mach-ep93xx/core.c
> +++ b/arch/arm/mach-ep93xx/core.c
> @@ -241,11 +241,7 @@ unsigned int ep93xx_chip_revision(void)
> * EP93xx GPIO
> *************************************************************************/
> static struct resource ep93xx_gpio_resource[] = {
> - {
> - .start = EP93XX_GPIO_PHYS_BASE,
> - .end = EP93XX_GPIO_PHYS_BASE + 0xcc - 1,
> - .flags = IORESOURCE_MEM,
> - },
> + DEFINE_RES_MEM(EP93XX_GPIO_PHYS_BASE, 0xcc),
> };
>
> static struct platform_device ep93xx_gpio_device = {
> @@ -288,11 +284,7 @@ static AMBA_APB_DEVICE(uart3, "apb:uart3", 0x00041010, EP93XX_UART3_PHYS_BASE,
> { IRQ_EP93XX_UART3 }, &ep93xx_uart_data);
>
> static struct resource ep93xx_rtc_resource[] = {
> - {
> - .start = EP93XX_RTC_PHYS_BASE,
> - .end = EP93XX_RTC_PHYS_BASE + 0x10c - 1,
> - .flags = IORESOURCE_MEM,
> - },
> + DEFINE_RES_MEM(EP93XX_RTC_PHYS_BASE, 0x10c),
> };
>
> static struct platform_device ep93xx_rtc_device = {
> @@ -304,16 +296,8 @@ static struct platform_device ep93xx_rtc_device = {
>
>
> static struct resource ep93xx_ohci_resources[] = {
> - [0] = {
> - .start = EP93XX_USB_PHYS_BASE,
> - .end = EP93XX_USB_PHYS_BASE + 0x0fff,
> - .flags = IORESOURCE_MEM,
> - },
> - [1] = {
> - .start = IRQ_EP93XX_USB,
> - .end = IRQ_EP93XX_USB,
> - .flags = IORESOURCE_IRQ,
> - },
> + DEFINE_RES_MEM(EP93XX_USB_PHYS_BASE, 0x1000),
> + DEFINE_RES_IRQ(IRQ_EP93XX_USB),
> };
>
>
> @@ -372,15 +356,8 @@ void __init ep93xx_register_flash(unsigned int width,
> static struct ep93xx_eth_data ep93xx_eth_data;
>
> static struct resource ep93xx_eth_resource[] = {
> - {
> - .start = EP93XX_ETHERNET_PHYS_BASE,
> - .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff,
> - .flags = IORESOURCE_MEM,
> - }, {
> - .start = IRQ_EP93XX_ETHERNET,
> - .end = IRQ_EP93XX_ETHERNET,
> - .flags = IORESOURCE_IRQ,
> - }
> + DEFINE_RES_MEM(EP93XX_ETHERNET_PHYS_BASE, 0x10000),
> + DEFINE_REQ_IRQ(IRQ_EP93XX_ETHERNET),
> };
>
> static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32);
> @@ -461,16 +438,8 @@ void __init ep93xx_register_i2c(struct i2c_gpio_platform_data *data,
> static struct ep93xx_spi_info ep93xx_spi_master_data;
>
> static struct resource ep93xx_spi_resources[] = {
> - {
> - .start = EP93XX_SPI_PHYS_BASE,
> - .end = EP93XX_SPI_PHYS_BASE + 0x18 - 1,
> - .flags = IORESOURCE_MEM,
> - },
> - {
> - .start = IRQ_EP93XX_SSP,
> - .end = IRQ_EP93XX_SSP,
> - .flags = IORESOURCE_IRQ,
> - },
> + DEFINE_RES_MEM(EP93XX_SPI_PHYS_BASE, 0x18),
> + DEFINE_RES_IRQ(IRQ_EP93XX_SSP),
> };
>
> static u64 ep93xx_spi_dma_mask = DMA_BIT_MASK(32);
> @@ -541,11 +510,7 @@ static struct platform_device ep93xx_leds = {
> * EP93xx pwm peripheral handling
> *************************************************************************/
> static struct resource ep93xx_pwm0_resource[] = {
> - {
> - .start = EP93XX_PWM_PHYS_BASE,
> - .end = EP93XX_PWM_PHYS_BASE + 0x10 - 1,
> - .flags = IORESOURCE_MEM,
> - },
> + DEFINE_RES_MEM(EP93XX_PWM_PHYS_BASE, 0x10),
> };
>
> static struct platform_device ep93xx_pwm0_device = {
> @@ -556,11 +521,7 @@ static struct platform_device ep93xx_pwm0_device = {
> };
>
> static struct resource ep93xx_pwm1_resource[] = {
> - {
> - .start = EP93XX_PWM_PHYS_BASE + 0x20,
> - .end = EP93XX_PWM_PHYS_BASE + 0x30 - 1,
> - .flags = IORESOURCE_MEM,
> - },
> + DEFINE_RES_MEM(EP93XX_PWM_PHYS_BASE + 0x20, 0x10),
> };
>
> static struct platform_device ep93xx_pwm1_device = {
> @@ -628,11 +589,7 @@ EXPORT_SYMBOL(ep93xx_pwm_release_gpio);
> static struct ep93xxfb_mach_info ep93xxfb_data;
>
> static struct resource ep93xx_fb_resource[] = {
> - {
> - .start = EP93XX_RASTER_PHYS_BASE,
> - .end = EP93XX_RASTER_PHYS_BASE + 0x800 - 1,
> - .flags = IORESOURCE_MEM,
> - },
> + DEFINE_RES_MEM(EP93XX_RASTER_PHYS_BASE, 0x800),
> };
>
> static struct platform_device ep93xx_fb_device = {
> @@ -680,15 +637,8 @@ void __init ep93xx_register_fb(struct ep93xxfb_mach_info *data)
> static struct ep93xx_keypad_platform_data ep93xx_keypad_data;
>
> static struct resource ep93xx_keypad_resource[] = {
> - {
> - .start = EP93XX_KEY_MATRIX_PHYS_BASE,
> - .end = EP93XX_KEY_MATRIX_PHYS_BASE + 0x0c - 1,
> - .flags = IORESOURCE_MEM,
> - }, {
> - .start = IRQ_EP93XX_KEY,
> - .end = IRQ_EP93XX_KEY,
> - .flags = IORESOURCE_IRQ,
> - },
> + DEFINE_RES_MEM(EP93XX_KEY_MATRIX_PHYS_BASE, 0x0c),
> + DEFINE_RES_IRQ(IRQ_EP93XX_KEY),
> };
>
> static struct platform_device ep93xx_keypad_device = {
> @@ -761,11 +711,7 @@ EXPORT_SYMBOL(ep93xx_keypad_release_gpio);
> * EP93xx I2S audio peripheral handling
> *************************************************************************/
> static struct resource ep93xx_i2s_resource[] = {
> - {
> - .start = EP93XX_I2S_PHYS_BASE,
> - .end = EP93XX_I2S_PHYS_BASE + 0x100 - 1,
> - .flags = IORESOURCE_MEM,
> - },
> + DEFINE_RES_MEM(EP93XX_I2S_PHYS_BASE, 0x100),
> };
>
> static struct platform_device ep93xx_i2s_device = {
> @@ -824,16 +770,8 @@ EXPORT_SYMBOL(ep93xx_i2s_release);
> * EP93xx AC97 audio peripheral handling
> *************************************************************************/
> static struct resource ep93xx_ac97_resources[] = {
> - {
> - .start = EP93XX_AAC_PHYS_BASE,
> - .end = EP93XX_AAC_PHYS_BASE + 0xac - 1,
> - .flags = IORESOURCE_MEM,
> - },
> - {
> - .start = IRQ_EP93XX_AACINTR,
> - .end = IRQ_EP93XX_AACINTR,
> - .flags = IORESOURCE_IRQ,
> - },
> + DEFINE_RES_MEM(EP93XX_AAC_PHYS_BASE, 0xac),
> + DEFINE_RES_IRQ(IRQ_EP93XX_AACINTR),
> };
>
> static struct platform_device ep93xx_ac97_device = {
prev parent reply other threads:[~2012-04-11 2:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 18:35 [PATCH] arm: ep93xx: use DEFINE_RES_* macros H Hartley Sweeten
2012-03-21 19:44 ` Mika Westerberg
2012-04-11 2:06 ` Ryan Mallon [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F84E742.6030507@gmail.com \
--to=rmallon@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.