openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:18:33 -08:00
parent 4c62e9764a
commit b859f15921
20 changed files with 65 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/platform/x86/acer-wmi.c
View File

@ -335,7 +335,7 @@ static struct quirk_entry quirk_lenovo_ideapad_s205 = {
}; };
/* The Aspire One has a dummy ACPI-WMI interface - disable it */ /* 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)", .ident = "Acer Aspire One (SSD)",
.matches = { .matches = {
@ -1330,7 +1330,7 @@ static struct led_classdev mail_led = {
.brightness_set = mail_led_set, .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); return led_classdev_register(dev, &mail_led);
} }
@ -1372,7 +1372,7 @@ static const struct backlight_ops acer_bl_ops = {
.update_status = update_bl_status, .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_properties props;
struct backlight_device *bd; struct backlight_device *bd;
@ -1961,7 +1961,7 @@ static u32 get_wmid_devices(void)
/* /*
* Platform device * Platform device
*/ */
static int __devinit acer_platform_probe(struct platform_device *device) static int acer_platform_probe(struct platform_device *device)
{ {
int err; int err;

2
drivers/platform/x86/acerhdf.c
View File

@ -515,7 +515,7 @@ static int acerhdf_suspend(struct device *dev)
return 0; return 0;
} }
static int __devinit acerhdf_probe(struct platform_device *device) static int acerhdf_probe(struct platform_device *device)
{ {
return 0; return 0;
} }

4
drivers/platform/x86/amilo-rfkill.c
View File

@ -74,7 +74,7 @@ static const struct rfkill_ops amilo_m7440_rfkill_ops = {
.set_block = amilo_m7440_rfkill_set_block .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 = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), 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 platform_device *amilo_rfkill_pdev;
static struct rfkill *amilo_rfkill_dev; 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; int rc;
const struct dmi_system_id *system_id = const struct dmi_system_id *system_id =

7
drivers/platform/x86/apple-gmux.c
View File

@ -411,8 +411,7 @@ static int gmux_resume(struct pnp_dev *pnp)
return 0; return 0;
} }
static int __devinit gmux_probe(struct pnp_dev *pnp, static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
const struct pnp_device_id *id)
{ {
struct apple_gmux_data *gmux_data; struct apple_gmux_data *gmux_data;
struct resource *res; struct resource *res;
@ -577,7 +576,7 @@ static int __devinit gmux_probe(struct pnp_dev *pnp,
return ret; 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); 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 = { static struct pnp_driver gmux_pnp_driver = {
.name = "apple-gmux", .name = "apple-gmux",
.probe = gmux_probe, .probe = gmux_probe,
.remove = __devexit_p(gmux_remove), .remove = gmux_remove,
.id_table = gmux_device_ids, .id_table = gmux_device_ids,
.suspend = gmux_suspend, .suspend = gmux_suspend,
.resume = gmux_resume .resume = gmux_resume

6
drivers/platform/x86/asus-laptop.c
View File

@ -1763,7 +1763,7 @@ static int asus_laptop_get_info(struct asus_laptop *asus)
return AE_OK; 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; int result = 0;
@ -1823,7 +1823,7 @@ static int __devinit asus_acpi_init(struct asus_laptop *asus)
return result; return result;
} }
static void __devinit asus_dmi_check(void) static void asus_dmi_check(void)
{ {
const char *model; const char *model;
@ -1839,7 +1839,7 @@ static void __devinit asus_dmi_check(void)
static bool asus_device_present; 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; struct asus_laptop *asus;
int result; int result;

10
drivers/platform/x86/compal-laptop.c
View File

@ -713,15 +713,15 @@ static struct attribute_group compal_attribute_group = {
.attrs = compal_attributes .attrs = compal_attributes
}; };
static int __devinit compal_probe(struct platform_device *); static int compal_probe(struct platform_device *);
static int __devexit compal_remove(struct platform_device *); static int compal_remove(struct platform_device *);
static struct platform_driver compal_driver = { static struct platform_driver compal_driver = {
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = compal_probe, .probe = compal_probe,
.remove = __devexit_p(compal_remove) .remove = compal_remove,
}; };
static enum power_supply_property compal_bat_properties[] = { static enum power_supply_property compal_bat_properties[] = {
@ -1015,7 +1015,7 @@ static int __init compal_init(void)
return ret; return ret;
} }
static int __devinit compal_probe(struct platform_device *pdev) static int compal_probe(struct platform_device *pdev)
{ {
int err; int err;
struct compal_data *data; struct compal_data *data;
@ -1067,7 +1067,7 @@ static void __exit compal_cleanup(void)
pr_info("Driver unloaded\n"); pr_info("Driver unloaded\n");
} }
static int __devexit compal_remove(struct platform_device *pdev) static int compal_remove(struct platform_device *pdev)
{ {
struct compal_data *data; struct compal_data *data;

4
drivers/platform/x86/dell-laptop.c
View File

@ -115,7 +115,7 @@ static const struct dmi_system_id dell_device_table[] __initconst = {
}; };
MODULE_DEVICE_TABLE(dmi, dell_device_table); MODULE_DEVICE_TABLE(dmi, dell_device_table);
static struct dmi_system_id __devinitdata dell_quirks[] = { static struct dmi_system_id dell_quirks[] = {
{ {
.callback = dmi_matched, .callback = dmi_matched,
.ident = "Dell Vostro V130", .ident = "Dell Vostro V130",
@ -503,7 +503,7 @@ static struct led_classdev touchpad_led = {
.flags = LED_CORE_SUSPENDRESUME, .flags = LED_CORE_SUSPENDRESUME,
}; };
static int __devinit touchpad_led_init(struct device *dev) static int touchpad_led_init(struct device *dev)
{ {
return led_classdev_register(dev, &touchpad_led); return led_classdev_register(dev, &touchpad_led);
} }

6
drivers/platform/x86/eeepc-laptop.c
View File

@ -1375,7 +1375,7 @@ static void cmsg_quirks(struct eeepc_laptop *eeepc)
cmsg_quirk(eeepc, CM_ASL_TPD, "TPD"); cmsg_quirk(eeepc, CM_ASL_TPD, "TPD");
} }
static int __devinit eeepc_acpi_init(struct eeepc_laptop *eeepc) static int eeepc_acpi_init(struct eeepc_laptop *eeepc)
{ {
unsigned int init_flags; unsigned int init_flags;
int result; int result;
@ -1407,7 +1407,7 @@ static int __devinit eeepc_acpi_init(struct eeepc_laptop *eeepc)
return 0; return 0;
} }
static void __devinit eeepc_enable_camera(struct eeepc_laptop *eeepc) static void eeepc_enable_camera(struct eeepc_laptop *eeepc)
{ {
/* /*
* If the following call to set_acpi() fails, it's because there's no * If the following call to set_acpi() fails, it's because there's no
@ -1419,7 +1419,7 @@ static void __devinit eeepc_enable_camera(struct eeepc_laptop *eeepc)
static bool eeepc_device_present; static bool eeepc_device_present;
static int __devinit eeepc_acpi_add(struct acpi_device *device) static int eeepc_acpi_add(struct acpi_device *device)
{ {
struct eeepc_laptop *eeepc; struct eeepc_laptop *eeepc;
int result; int result;

17
drivers/platform/x86/fujitsu-tablet.c
View File

@ -192,8 +192,8 @@ static void fujitsu_reset(void)
fujitsu_send_state(); fujitsu_send_state();
} }
static int __devinit input_fujitsu_setup(struct device *parent, static int input_fujitsu_setup(struct device *parent, const char *name,
const char *name, const char *phys) const char *phys)
{ {
struct input_dev *idev; struct input_dev *idev;
int error; int error;
@ -277,21 +277,21 @@ static irqreturn_t fujitsu_interrupt(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void __devinit fujitsu_dmi_common(const struct dmi_system_id *dmi) static void fujitsu_dmi_common(const struct dmi_system_id *dmi)
{ {
pr_info("%s\n", dmi->ident); pr_info("%s\n", dmi->ident);
memcpy(fujitsu.config.keymap, dmi->driver_data, memcpy(fujitsu.config.keymap, dmi->driver_data,
sizeof(fujitsu.config.keymap)); sizeof(fujitsu.config.keymap));
} }
static int __devinit fujitsu_dmi_lifebook(const struct dmi_system_id *dmi) static int fujitsu_dmi_lifebook(const struct dmi_system_id *dmi)
{ {
fujitsu_dmi_common(dmi); fujitsu_dmi_common(dmi);
fujitsu.config.quirks |= INVERT_TABLET_MODE_BIT; fujitsu.config.quirks |= INVERT_TABLET_MODE_BIT;
return 1; return 1;
} }
static int __devinit fujitsu_dmi_stylistic(const struct dmi_system_id *dmi) static int fujitsu_dmi_stylistic(const struct dmi_system_id *dmi)
{ {
fujitsu_dmi_common(dmi); fujitsu_dmi_common(dmi);
fujitsu.config.quirks |= FORCE_TABLET_MODE_IF_UNDOCK; fujitsu.config.quirks |= FORCE_TABLET_MODE_IF_UNDOCK;
@ -366,8 +366,7 @@ static const struct dmi_system_id dmi_ids[] __initconst = {
{ NULL } { NULL }
}; };
static acpi_status __devinit static acpi_status fujitsu_walk_resources(struct acpi_resource *res, void *data)
fujitsu_walk_resources(struct acpi_resource *res, void *data)
{ {
switch (res->type) { switch (res->type) {
case ACPI_RESOURCE_TYPE_IRQ: case ACPI_RESOURCE_TYPE_IRQ:
@ -390,7 +389,7 @@ fujitsu_walk_resources(struct acpi_resource *res, void *data)
} }
} }
static int __devinit acpi_fujitsu_add(struct acpi_device *adev) static int acpi_fujitsu_add(struct acpi_device *adev)
{ {
acpi_status status; acpi_status status;
int error; int error;
@ -432,7 +431,7 @@ static int __devinit acpi_fujitsu_add(struct acpi_device *adev)
return 0; return 0;
} }
static int __devexit acpi_fujitsu_remove(struct acpi_device *adev, int type) static int acpi_fujitsu_remove(struct acpi_device *adev, int type)
{ {
free_irq(fujitsu.irq, fujitsu_interrupt); free_irq(fujitsu.irq, fujitsu_interrupt);
release_region(fujitsu.io_base, fujitsu.io_length); release_region(fujitsu.io_base, fujitsu.io_length);

8
drivers/platform/x86/hp-wmi.c
View File

@ -72,7 +72,7 @@ enum hp_wmi_event_ids {
HPWMI_LOCK_SWITCH = 7, HPWMI_LOCK_SWITCH = 7,
}; };
static int __devinit hp_wmi_bios_setup(struct platform_device *device); static int hp_wmi_bios_setup(struct platform_device *device);
static int __exit hp_wmi_bios_remove(struct platform_device *device); static int __exit hp_wmi_bios_remove(struct platform_device *device);
static int hp_wmi_resume_handler(struct device *device); static int hp_wmi_resume_handler(struct device *device);
@ -619,7 +619,7 @@ static void cleanup_sysfs(struct platform_device *device)
device_remove_file(&device->dev, &dev_attr_tablet); device_remove_file(&device->dev, &dev_attr_tablet);
} }
static int __devinit hp_wmi_rfkill_setup(struct platform_device *device) static int hp_wmi_rfkill_setup(struct platform_device *device)
{ {
int err; int err;
int wireless = 0; int wireless = 0;
@ -698,7 +698,7 @@ static int __devinit hp_wmi_rfkill_setup(struct platform_device *device)
return err; return err;
} }
static int __devinit hp_wmi_rfkill2_setup(struct platform_device *device) static int hp_wmi_rfkill2_setup(struct platform_device *device)
{ {
int err, i; int err, i;
struct bios_rfkill2_state state; struct bios_rfkill2_state state;
@ -778,7 +778,7 @@ static int __devinit hp_wmi_rfkill2_setup(struct platform_device *device)
return err; return err;
} }
static int __devinit hp_wmi_bios_setup(struct platform_device *device) static int hp_wmi_bios_setup(struct platform_device *device)
{ {
int err; int err;

13
drivers/platform/x86/ideapad-laptop.c
View File

@ -298,7 +298,7 @@ static const struct file_operations debugfs_cfg_fops = {
.release = single_release, .release = single_release,
}; };
static int __devinit ideapad_debugfs_init(struct ideapad_private *priv) static int ideapad_debugfs_init(struct ideapad_private *priv)
{ {
struct dentry *node; struct dentry *node;
@ -468,8 +468,7 @@ static void ideapad_sync_rfk_state(struct ideapad_private *priv)
rfkill_set_hw_state(priv->rfk[i], hw_blocked); rfkill_set_hw_state(priv->rfk[i], hw_blocked);
} }
static int __devinit ideapad_register_rfkill(struct acpi_device *adevice, static int ideapad_register_rfkill(struct acpi_device *adevice, int dev)
int dev)
{ {
struct ideapad_private *priv = dev_get_drvdata(&adevice->dev); struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);
int ret; int ret;
@ -519,7 +518,7 @@ static void ideapad_unregister_rfkill(struct acpi_device *adevice, int dev)
/* /*
* Platform device * Platform device
*/ */
static int __devinit ideapad_platform_init(struct ideapad_private *priv) static int ideapad_platform_init(struct ideapad_private *priv)
{ {
int result; int result;
@ -569,7 +568,7 @@ static const struct key_entry ideapad_keymap[] = {
{ KE_END, 0 }, { KE_END, 0 },
}; };
static int __devinit ideapad_input_init(struct ideapad_private *priv) static int ideapad_input_init(struct ideapad_private *priv)
{ {
struct input_dev *inputdev; struct input_dev *inputdev;
int error; int error;
@ -776,7 +775,7 @@ static void ideapad_sync_touchpad_state(struct acpi_device *adevice)
} }
} }
static int __devinit ideapad_acpi_add(struct acpi_device *adevice) static int ideapad_acpi_add(struct acpi_device *adevice)
{ {
int ret, i; int ret, i;
int cfg; int cfg;
@ -835,7 +834,7 @@ static int __devinit ideapad_acpi_add(struct acpi_device *adevice)
return ret; return ret;
} }
static int __devexit ideapad_acpi_remove(struct acpi_device *adevice, int type) static int ideapad_acpi_remove(struct acpi_device *adevice, int type)
{ {
struct ideapad_private *priv = dev_get_drvdata(&adevice->dev); struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);
int i; int i;

6
drivers/platform/x86/intel_mid_powerbtn.c
View File

@ -56,7 +56,7 @@ static irqreturn_t mfld_pb_isr(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit mfld_pb_probe(struct platform_device *pdev) static int mfld_pb_probe(struct platform_device *pdev)
{ {
struct input_dev *input; struct input_dev *input;
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
@ -121,7 +121,7 @@ static int __devinit mfld_pb_probe(struct platform_device *pdev)
return error; return error;
} }
static int __devexit mfld_pb_remove(struct platform_device *pdev) static int mfld_pb_remove(struct platform_device *pdev)
{ {
struct input_dev *input = platform_get_drvdata(pdev); struct input_dev *input = platform_get_drvdata(pdev);
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
@ -139,7 +139,7 @@ static struct platform_driver mfld_pb_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = mfld_pb_probe, .probe = mfld_pb_probe,
.remove = __devexit_p(mfld_pb_remove), .remove = mfld_pb_remove,
}; };
module_platform_driver(mfld_pb_driver); module_platform_driver(mfld_pb_driver);

2
drivers/platform/x86/intel_mid_thermal.c
View File

@ -563,7 +563,7 @@ static struct platform_driver mid_thermal_driver = {
.pm = &mid_thermal_pm, .pm = &mid_thermal_pm,
}, },
.probe = mid_thermal_probe, .probe = mid_thermal_probe,
.remove = __devexit_p(mid_thermal_remove), .remove = mid_thermal_remove,
.id_table = therm_id_table, .id_table = therm_id_table,
}; };

6
drivers/platform/x86/intel_oaktrail.c
View File

@ -278,12 +278,12 @@ static void oaktrail_backlight_exit(void)
backlight_device_unregister(oaktrail_bl_device); backlight_device_unregister(oaktrail_bl_device);
} }
static int __devinit oaktrail_probe(struct platform_device *pdev) static int oaktrail_probe(struct platform_device *pdev)
{ {
return 0; return 0;
} }
static int __devexit oaktrail_remove(struct platform_device *pdev) static int oaktrail_remove(struct platform_device *pdev)
{ {
return 0; return 0;
} }
@ -294,7 +294,7 @@ static struct platform_driver oaktrail_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = oaktrail_probe, .probe = oaktrail_probe,
.remove = __devexit_p(oaktrail_remove) .remove = oaktrail_remove,
}; };
static int dmi_check_cb(const struct dmi_system_id *id) static int dmi_check_cb(const struct dmi_system_id *id)

2
drivers/platform/x86/intel_pmic_gpio.c
View File

@ -230,7 +230,7 @@ static irqreturn_t pmic_irq_handler(int irq, void *data)
return ret; return ret;
} }
static int __devinit platform_pmic_gpio_probe(struct platform_device *pdev) static int platform_pmic_gpio_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);

6
drivers/platform/x86/samsung-q10.c
View File

@ -77,7 +77,7 @@ static int samsungq10_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(samsungq10_pm_ops, static SIMPLE_DEV_PM_OPS(samsungq10_pm_ops,
samsungq10_suspend, samsungq10_resume); samsungq10_suspend, samsungq10_resume);
static int __devinit samsungq10_probe(struct platform_device *pdev) static int samsungq10_probe(struct platform_device *pdev)
{ {
struct backlight_properties props; struct backlight_properties props;
@ -99,7 +99,7 @@ static int __devinit samsungq10_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit samsungq10_remove(struct platform_device *pdev) static int samsungq10_remove(struct platform_device *pdev)
{ {
struct backlight_device *bd = platform_get_drvdata(pdev); struct backlight_device *bd = platform_get_drvdata(pdev);
@ -119,7 +119,7 @@ static struct platform_driver samsungq10_driver = {
.pm = &samsungq10_pm_ops, .pm = &samsungq10_pm_ops,
}, },
.probe = samsungq10_probe, .probe = samsungq10_probe,
.remove = __devexit_p(samsungq10_remove), .remove = samsungq10_remove,
}; };
static struct platform_device *samsungq10_device; static struct platform_device *samsungq10_device;

4
drivers/platform/x86/tc1100-wmi.c
View File

@ -187,7 +187,7 @@ static int __init tc1100_probe(struct platform_device *device)
} }
static int __devexit tc1100_remove(struct platform_device *device) static int tc1100_remove(struct platform_device *device)
{ {
sysfs_remove_group(&device->dev.kobj, &tc1100_attribute_group); sysfs_remove_group(&device->dev.kobj, &tc1100_attribute_group);
@ -241,7 +241,7 @@ static struct platform_driver tc1100_driver = {
.pm = &tc1100_pm_ops, .pm = &tc1100_pm_ops,
#endif #endif
}, },
.remove = __devexit_p(tc1100_remove), .remove = tc1100_remove,
}; };
static int __init tc1100_init(void) static int __init tc1100_init(void)

4
drivers/platform/x86/thinkpad_acpi.c
View File

@ -6732,7 +6732,7 @@ static int volume_alsa_mute_put(struct snd_kcontrol *kcontrol,
return volume_alsa_set_mute(!ucontrol->value.integer.value[0]); return volume_alsa_set_mute(!ucontrol->value.integer.value[0]);
} }
static struct snd_kcontrol_new volume_alsa_control_vol __devinitdata = { static struct snd_kcontrol_new volume_alsa_control_vol = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Console Playback Volume", .name = "Console Playback Volume",
.index = 0, .index = 0,
@ -6741,7 +6741,7 @@ static struct snd_kcontrol_new volume_alsa_control_vol __devinitdata = {
.get = volume_alsa_vol_get, .get = volume_alsa_vol_get,
}; };
static struct snd_kcontrol_new volume_alsa_control_mute __devinitdata = { static struct snd_kcontrol_new volume_alsa_control_mute = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Console Playback Switch", .name = "Console Playback Switch",
.index = 0, .index = 0,

13
drivers/platform/x86/toshiba_acpi.c
View File

@ -150,7 +150,7 @@ static const struct acpi_device_id toshiba_device_ids[] = {
}; };
MODULE_DEVICE_TABLE(acpi, toshiba_device_ids); MODULE_DEVICE_TABLE(acpi, toshiba_device_ids);
static const struct key_entry toshiba_acpi_keymap[] __devinitconst = { static const struct key_entry toshiba_acpi_keymap[] = {
{ KE_KEY, 0x101, { KEY_MUTE } }, { KE_KEY, 0x101, { KEY_MUTE } },
{ KE_KEY, 0x102, { KEY_ZOOMOUT } }, { KE_KEY, 0x102, { KEY_ZOOMOUT } },
{ KE_KEY, 0x103, { KEY_ZOOMIN } }, { KE_KEY, 0x103, { KEY_ZOOMIN } },
@ -875,8 +875,7 @@ static const struct file_operations version_proc_fops = {
#define PROC_TOSHIBA "toshiba" #define PROC_TOSHIBA "toshiba"
static void __devinit static void create_toshiba_proc_entries(struct toshiba_acpi_dev *dev)
create_toshiba_proc_entries(struct toshiba_acpi_dev *dev)
{ {
if (dev->backlight_dev) if (dev->backlight_dev)
proc_create_data("lcd", S_IRUGO | S_IWUSR, toshiba_proc_dir, proc_create_data("lcd", S_IRUGO | S_IWUSR, toshiba_proc_dir,
@ -979,7 +978,7 @@ static void toshiba_acpi_report_hotkey(struct toshiba_acpi_dev *dev,
pr_info("Unknown key %x\n", scancode); pr_info("Unknown key %x\n", scancode);
} }
static int __devinit toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
{ {
acpi_status status; acpi_status status;
acpi_handle ec_handle, handle; acpi_handle ec_handle, handle;
@ -1069,7 +1068,7 @@ static int __devinit toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
return error; return error;
} }
static int __devinit toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev) static int toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev)
{ {
struct backlight_properties props; struct backlight_properties props;
int brightness; int brightness;
@ -1154,7 +1153,7 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev, int type)
return 0; return 0;
} }
static const char * __devinit find_hci_method(acpi_handle handle) static const char *find_hci_method(acpi_handle handle)
{ {
acpi_status status; acpi_status status;
acpi_handle hci_handle; acpi_handle hci_handle;
@ -1170,7 +1169,7 @@ static const char * __devinit find_hci_method(acpi_handle handle)
return NULL; return NULL;
} }
static int __devinit toshiba_acpi_add(struct acpi_device *acpi_dev) static int toshiba_acpi_add(struct acpi_device *acpi_dev)
{ {
struct toshiba_acpi_dev *dev; struct toshiba_acpi_dev *dev;
const char *hci_method; const char *hci_method;

6
drivers/platform/x86/xo1-rfkill.c
View File

@ -40,7 +40,7 @@ static const struct rfkill_ops rfkill_ops = {
.set_block = rfkill_set_block, .set_block = rfkill_set_block,
}; };
static int __devinit xo1_rfkill_probe(struct platform_device *pdev) static int xo1_rfkill_probe(struct platform_device *pdev)
{ {
struct rfkill *rfk; struct rfkill *rfk;
int r; int r;
@ -60,7 +60,7 @@ static int __devinit xo1_rfkill_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit xo1_rfkill_remove(struct platform_device *pdev) static int xo1_rfkill_remove(struct platform_device *pdev)
{ {
struct rfkill *rfk = platform_get_drvdata(pdev); struct rfkill *rfk = platform_get_drvdata(pdev);
rfkill_unregister(rfk); rfkill_unregister(rfk);
@ -74,7 +74,7 @@ static struct platform_driver xo1_rfkill_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = xo1_rfkill_probe, .probe = xo1_rfkill_probe,
.remove = __devexit_p(xo1_rfkill_remove), .remove = xo1_rfkill_remove,
}; };
module_platform_driver(xo1_rfkill_driver); module_platform_driver(xo1_rfkill_driver);