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

Commit c571b211 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: amba: remove __dev* attributes. 



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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4eab7a9e

drivers/amba/bus.c

+0 −4
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ static int amba_match(struct device *dev, struct device_driver *drv) 
	return amba_lookup(pcdrv->id_table, pcdev) != NULL;

}



#ifdef CONFIG_HOTPLUG

static int amba_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	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);

	return retval;

}

#else

#define amba_uevent NULL

#endif



#define amba_attr_func(name,fmt,arg...)					\

static ssize_t name##_show(struct device *_dev,				\

drivers/amba/tegra-ahb.c

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static void tegra_ahb_gizmo_init(struct tegra_ahb *ahb) 
	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 tegra_ahb *ahb;
@@ -267,7 +267,7 @@ static int __devinit tegra_ahb_probe(struct platform_device *pdev) 
	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,tegra20-ahb", },

	{},