Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e5629a authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

[ARM] 3460/1: ARM: OMAP: Remove unnecessary nop_release() 



Patch from Tony Lindgren

Remove unnecessary omap_nop_release() as noted by RMK.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 93235579

arch/arm/mach-omap1/devices.c

+0 −11
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ 
#include <asm/arch/mux.h>

#include <asm/arch/gpio.h>



extern void omap_nop_release(struct device *dev);



/*-------------------------------------------------------------------------*/



#if	defined(CONFIG_OMAP1610_IR) || defined(CONFIG_OMAP161O_IR_MODULE)



static u64 irda_dmamask = 0xffffffff;
@@ -37,7 +33,6 @@ static struct platform_device omap1610ir_device = { 
	.name = "omap1610-ir",

	.id = -1,

	.dev = {

		.release	= omap_nop_release,

		.dma_mask	= &irda_dmamask,

	},

};
@@ -84,9 +79,6 @@ static struct resource rtc_resources[] = { 
static struct platform_device omap_rtc_device = {

	.name           = "omap_rtc",

	.id             = -1,

	.dev = {

		.release        = omap_nop_release,

	},

	.num_resources	= ARRAY_SIZE(rtc_resources),

	.resource	= rtc_resources,

};
@@ -124,9 +116,6 @@ static struct resource sti_resources[] = { 
static struct platform_device sti_device = {

	.name		= "sti",

	.id		= -1,

	.dev = {

		.release	= omap_nop_release,

	},

	.num_resources	= ARRAY_SIZE(sti_resources),

	.resource	= sti_resources,

};

arch/arm/mach-omap2/devices.c

+0 −10
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ 
#include <asm/arch/mux.h>

#include <asm/arch/gpio.h>



extern void omap_nop_release(struct device *dev);



/*-------------------------------------------------------------------------*/



#if 	defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)



#define OMAP2_I2C_BASE2		0x48072000
@@ -49,9 +45,6 @@ static struct resource i2c_resources2[] = { 
static struct platform_device omap_i2c_device2 = {

        .name           = "i2c_omap",

        .id             = 2,

        .dev = {

                .release        = omap_nop_release,

        },

	.num_resources	= ARRAY_SIZE(i2c_resources2),

	.resource	= i2c_resources2,

};
@@ -100,9 +93,6 @@ static struct resource sti_resources[] = { 
static struct platform_device sti_device = {

	.name		= "sti",

	.id		= -1,

	.dev = {

		.release	= omap_nop_release,

	},

	.num_resources	= ARRAY_SIZE(sti_resources),

	.resource	= sti_resources,

};

arch/arm/plat-omap/devices.c

+0 −22
Original line number Diff line number Diff line
@@ -26,14 +26,6 @@ 
#include <asm/arch/gpio.h>

#include <asm/arch/menelaus.h>





void omap_nop_release(struct device *dev)

{

        /* Nothing */

}



/*-------------------------------------------------------------------------*/



#if 	defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)



#define	OMAP1_I2C_BASE		0xfffb3800
@@ -59,9 +51,6 @@ static struct resource i2c_resources1[] = { 
static struct platform_device omap_i2c_device1 = {

        .name           = "i2c_omap",

        .id             = 1,

        .dev = {

                .release        = omap_nop_release,

        },

	.num_resources	= ARRAY_SIZE(i2c_resources1),

	.resource	= i2c_resources1,

};
@@ -187,7 +176,6 @@ static struct platform_device mmc_omap_device1 = { 
	.name		= "mmci-omap",

	.id		= 1,

	.dev = {

		.release	= omap_nop_release,

		.dma_mask	= &mmc1_dmamask,

		.platform_data	= &mmc1_conf,

	},
@@ -217,7 +205,6 @@ static struct platform_device mmc_omap_device2 = { 
	.name		= "mmci-omap",

	.id		= 2,

	.dev = {

		.release	= omap_nop_release,

		.dma_mask	= &mmc2_dmamask,

		.platform_data	= &mmc2_conf,

	},
@@ -321,9 +308,6 @@ static struct resource uwire_resources[] = { 
static struct platform_device omap_uwire_device = {

	.name	   = "omap_uwire",

	.id	     = -1,

	.dev = {

		.release	= omap_nop_release,

	},

	.num_resources	= ARRAY_SIZE(uwire_resources),

	.resource	= uwire_resources,

};
@@ -365,9 +349,6 @@ static struct resource wdt_resources[] = { 
static struct platform_device omap_wdt_device = {

	.name	   = "omap_wdt",

	.id	     = -1,

	.dev = {

		.release	= omap_nop_release,

	},

	.num_resources	= ARRAY_SIZE(wdt_resources),

	.resource	= wdt_resources,

};
@@ -401,9 +382,6 @@ static struct resource rng_resources[] = { 
static struct platform_device omap_rng_device = {

	.name	   = "omap_rng",

	.id	     = -1,

	.dev = {

		.release	= omap_nop_release,

	},

	.num_resources	= ARRAY_SIZE(rng_resources),

	.resource	= rng_resources,

};