leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drivers: amba: remove __dev* attributes.

Browse Source 
CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed, as well as the use of CONFIG_HOTPLUG.

This patch does both, removing the use of CONFIG_HOTPLUG in the
amba/bus.c file, and __devinit and __devinitconst in the tegra-ahb.c
driver.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:16:42 -08:00
parent 4eab7a9eb2
commit c571b211a7
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/amba/bus.c
View File

@ -45,7 +45,6 @@ static int amba_match(struct device *dev, struct device_driver *drv)
return amba_lookup(pcdrv->id_table, pcdev) != NULL; return amba_lookup(pcdrv->id_table, pcdev) != NULL;
} }
#ifdef CONFIG_HOTPLUG
static int amba_uevent(struct device *dev, struct kobj_uevent_env *env) static int amba_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
struct amba_device *pcdev = to_amba_device(dev); struct amba_device *pcdev = to_amba_device(dev);
@ -58,9 +57,6 @@ static int amba_uevent(struct device *dev, struct kobj_uevent_env *env)
retval = add_uevent_var(env, "MODALIAS=amba:d%08X", pcdev->periphid); retval = add_uevent_var(env, "MODALIAS=amba:d%08X", pcdev->periphid);
return retval; return retval;
} }
#else
#define amba_uevent NULL
#endif
#define amba_attr_func(name,fmt,arg...) \ #define amba_attr_func(name,fmt,arg...) \
static ssize_t name##_show(struct device *_dev, \ static ssize_t name##_show(struct device *_dev, \

4
drivers/amba/tegra-ahb.c
View File

@ -243,7 +243,7 @@ static void tegra_ahb_gizmo_init(struct tegra_ahb *ahb)
gizmo_writel(ahb, val, AHB_MEM_PREFETCH_CFG4); gizmo_writel(ahb, val, AHB_MEM_PREFETCH_CFG4);
} }
static int __devinit tegra_ahb_probe(struct platform_device *pdev) static int tegra_ahb_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct tegra_ahb *ahb; struct tegra_ahb *ahb;
@ -267,7 +267,7 @@ static int __devinit tegra_ahb_probe(struct platform_device *pdev)
return 0; return 0;
} }
static const struct of_device_id tegra_ahb_of_match[] __devinitconst = { static const struct of_device_id tegra_ahb_of_match[] = {
{ .compatible = "nvidia,tegra30-ahb", }, { .compatible = "nvidia,tegra30-ahb", },
{ .compatible = "nvidia,tegra20-ahb", }, { .compatible = "nvidia,tegra20-ahb", },
{}, {},