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

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

Drivers: platform: x86: remove __dev* attributes. 



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

This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Joey Lee <jlee@novell.com>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Peter Feuerer <peter@piie.net>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
Cc: Robert Gerlach <khnz@gmx.de>
Cc: Ike Panhc <ike.pan@canonical.com>
Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c62e976

drivers/platform/x86/acer-wmi.c

+4 −4
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static struct quirk_entry quirk_lenovo_ideapad_s205 = { 
};



/* The Aspire One has a dummy ACPI-WMI interface - disable it */

static struct dmi_system_id __devinitdata acer_blacklist[] = {

static struct dmi_system_id acer_blacklist[] = {

	{

		.ident = "Acer Aspire One (SSD)",

		.matches = {
@@ -1330,7 +1330,7 @@ static struct led_classdev mail_led = { 
	.brightness_set = mail_led_set,

};



static int __devinit acer_led_init(struct device *dev)

static int acer_led_init(struct device *dev)

{

	return led_classdev_register(dev, &mail_led);

}
@@ -1372,7 +1372,7 @@ static const struct backlight_ops acer_bl_ops = { 
	.update_status = update_bl_status,

};



static int __devinit acer_backlight_init(struct device *dev)

static int acer_backlight_init(struct device *dev)

{

	struct backlight_properties props;

	struct backlight_device *bd;
@@ -1961,7 +1961,7 @@ static u32 get_wmid_devices(void) 
/*

 * Platform device

 */

static int __devinit acer_platform_probe(struct platform_device *device)

static int acer_platform_probe(struct platform_device *device)

{

	int err;

drivers/platform/x86/acerhdf.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int acerhdf_suspend(struct device *dev) 
	return 0;

}



static int __devinit acerhdf_probe(struct platform_device *device)

static int acerhdf_probe(struct platform_device *device)

{

	return 0;

}

drivers/platform/x86/amilo-rfkill.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static const struct rfkill_ops amilo_m7440_rfkill_ops = { 
	.set_block = amilo_m7440_rfkill_set_block

};



static const struct dmi_system_id __devinitconst amilo_rfkill_id_table[] = {

static const struct dmi_system_id amilo_rfkill_id_table[] = {

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
@@ -95,7 +95,7 @@ static const struct dmi_system_id __devinitconst amilo_rfkill_id_table[] = { 
static struct platform_device *amilo_rfkill_pdev;

static struct rfkill *amilo_rfkill_dev;



static int __devinit amilo_rfkill_probe(struct platform_device *device)

static int amilo_rfkill_probe(struct platform_device *device)

{

	int rc;

	const struct dmi_system_id *system_id =

drivers/platform/x86/apple-gmux.c

+3 −4
Original line number Diff line number Diff line
@@ -411,8 +411,7 @@ static int gmux_resume(struct pnp_dev *pnp) 
	return 0;

}



static int __devinit gmux_probe(struct pnp_dev *pnp,

				const struct pnp_device_id *id)

static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)

{

	struct apple_gmux_data *gmux_data;

	struct resource *res;
@@ -577,7 +576,7 @@ static int __devinit gmux_probe(struct pnp_dev *pnp, 
	return ret;

}



static void __devexit gmux_remove(struct pnp_dev *pnp)

static void gmux_remove(struct pnp_dev *pnp)

{

	struct apple_gmux_data *gmux_data = pnp_get_drvdata(pnp);
@@ -609,7 +608,7 @@ static const struct pnp_device_id gmux_device_ids[] = { 
static struct pnp_driver gmux_pnp_driver = {

	.name		= "apple-gmux",

	.probe		= gmux_probe,

	.remove		= __devexit_p(gmux_remove),

	.remove		= gmux_remove,

	.id_table	= gmux_device_ids,

	.suspend	= gmux_suspend,

	.resume		= gmux_resume

drivers/platform/x86/asus-laptop.c

+3 −3
Original line number Diff line number Diff line
@@ -1763,7 +1763,7 @@ static int asus_laptop_get_info(struct asus_laptop *asus) 
	return AE_OK;

}



static int __devinit asus_acpi_init(struct asus_laptop *asus)

static int asus_acpi_init(struct asus_laptop *asus)

{

	int result = 0;
@@ -1823,7 +1823,7 @@ static int __devinit asus_acpi_init(struct asus_laptop *asus) 
	return result;

}



static void __devinit asus_dmi_check(void)

static void asus_dmi_check(void)

{

	const char *model;
@@ -1839,7 +1839,7 @@ static void __devinit asus_dmi_check(void) 


static bool asus_device_present;



static int __devinit asus_acpi_add(struct acpi_device *device)

static int asus_acpi_add(struct acpi_device *device)

{

	struct asus_laptop *asus;

	int result;