i2c: remove CONFIG_HOTPLUG ifdefs
Subsystems (384)
PATCH 235/493 mfd: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Srinidhi Kasagar <[email protected]>
Cc Peter Tyser <[email protected]>
Cc David Brown <[email protected]>
Cc Daniel Walker <[email protected]>
Cc Bryan Huntsman <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc device-drivers-devel at blackfin.uclinux.org
Cc patches at opensource.wolfsonmicro.com
Cc linux-arm-msm at vger.kernel.org
--- drivers/mfd/88pm800.c | 8 ++++---- drivers/mfd/88pm805.c | 6 +++--- drivers/mfd/88pm80x.c | 2 +- drivers/mfd/88pm860x-core.c | 30 +++++++++++++++--------------- drivers/mfd/ab3100-core.c | 4 ++-- drivers/mfd/ab8500-core.c | 2 +- drivers/mfd/ab8500-debugfs.c | 2 +- drivers/mfd/ab8500-gpadc.c | 2 +- drivers/mfd/ab8500-sysctrl.c | 2 +- drivers/mfd/adp5520.c | 2 +- drivers/mfd/arizona-core.c | 2 +- drivers/mfd/arizona-i2c.c | 2 +- drivers/mfd/arizona-spi.c | 2 +- drivers/mfd/cs5535-mfd.c | 4 ++-- drivers/mfd/da903x.c | 6 +++--- drivers/mfd/da9052-core.c | 2 +- drivers/mfd/da9052-i2c.c | 2 +- drivers/mfd/da9052-spi.c | 2 +- drivers/mfd/da9055-core.c | 2 +- drivers/mfd/da9055-i2c.c | 2 +- drivers/mfd/db8500-prcmu.c | 2 +- drivers/mfd/ezx-pcap.c | 4 ++-- drivers/mfd/htc-i2cpld.c | 12 ++++++------ drivers/mfd/intel_msic.c | 4 ++-- drivers/mfd/janz-cmodio.c | 6 +++--- drivers/mfd/jz4740-adc.c | 2 +- drivers/mfd/lm3533-core.c | 12 ++++++------ drivers/mfd/lpc_ich.c | 14 +++++++------- drivers/mfd/lpc_sch.c | 2 +- drivers/mfd/max8907.c | 2 +- drivers/mfd/max8925-core.c | 4 ++-- drivers/mfd/max8925-i2c.c | 2 +- drivers/mfd/omap-usb-host.c | 2 +- drivers/mfd/omap-usb-tll.c | 2 +- drivers/mfd/palmas.c | 4 ++-- drivers/mfd/pcf50633-adc.c | 2 +- drivers/mfd/pcf50633-core.c | 2 +- drivers/mfd/pm8921-core.c | 4 ++-- drivers/mfd/pm8xxx-irq.c | 2 +- drivers/mfd/rc5t583.c | 2 +- drivers/mfd/rdc321x-southbridge.c | 2 +- drivers/mfd/rtsx_pcr.c | 2 +- drivers/mfd/sm501.c | 10 +++++----- drivers/mfd/sta2x11-mfd.c | 4 ++-- drivers/mfd/stmpe-i2c.c | 2 +- drivers/mfd/stmpe-spi.c | 2 +- drivers/mfd/stmpe.c | 12 ++++++------ drivers/mfd/syscon.c | 2 +- drivers/mfd/tc3589x.c | 4 ++-- drivers/mfd/tc6387xb.c | 2 +- drivers/mfd/tc6393xb.c | 2 +- drivers/mfd/ti-ssp.c | 2 +- drivers/mfd/ti_am335x_tscadc.c | 2 +- drivers/mfd/timberdale.c | 2 +- drivers/mfd/tps6105x.c | 4 ++-- drivers/mfd/tps65090.c | 4 ++-- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 6 +++--- drivers/mfd/tps65910.c | 6 +++--- drivers/mfd/tps65911-comparator.c | 2 +- drivers/mfd/tps65912-spi.c | 2 +- drivers/mfd/twl-core.c | 2 +- drivers/mfd/twl4030-audio.c | 2 +- drivers/mfd/twl4030-madc.c | 2 +- drivers/mfd/twl4030-power.c | 20 ++++++++++---------- drivers/mfd/twl6040.c | 4 ++-- drivers/mfd/vexpress-sysreg.c | 2 +- drivers/mfd/vx855.c | 2 +- drivers/mfd/wl1273-core.c | 2 +- drivers/mfd/wm831x-spi.c | 2 +- drivers/mfd/wm8994-core.c | 4 ++-- include/linux/mfd/88pm80x.h | 2 +- include/linux/mfd/abx500/ab8500.h | 2 +- include/linux/mfd/pm8xxx/irq.h | 4 ++-- 74 files changed, 149 insertions(+), 149 deletions(-)
drivers/mfd/88pm800.c +4 -4
@@ -248,7 +248,7 @@ static const struct regmap_irq pm800_irqs[] = { }, }; -static int __devinit device_gpadc_init (struct pm80x_chip *chip, +static int device_gpadc_init (struct pm80x_chip *chip,struct pm80x_platform_data *pdata) {struct pm80x_subchip *subchip = chip->subchip;
@@ -315,7 +315,7 @@ out:return ret; } -static int __devinit device_irq_init_800 (struct pm80x_chip *chip) +static int device_irq_init_800 (struct pm80x_chip *chip) {struct regmap *map = chip->regmap;unsigned long flags =IRQF_TRIGGER_FALLING |IRQF_ONESHOT ;
@@ -415,7 +415,7 @@ static void pm800_pages_exit(struct pm80x_chip *chip) } } -static int __devinit device_800_init (struct pm80x_chip *chip, +static int device_800_init (struct pm80x_chip *chip,struct pm80x_platform_data *pdata) {int ret, pmic_id;
@@ -499,7 +499,7 @@ out:return ret; } -static int __devinit pm800_probe (struct i2c_client *client, +static int pm800_probe (struct i2c_client *client,const struct i2c_device_id *id) {int ret =0 ;
drivers/mfd/88pm805.c +3 -3
@@ -135,7 +135,7 @@ static struct regmap_irq pm805_irqs[] = { }, }; -static int __devinit device_irq_init_805 (struct pm80x_chip *chip) +static int device_irq_init_805 (struct pm80x_chip *chip) {struct regmap *map = chip->regmap;unsigned long flags =IRQF_TRIGGER_FALLING |IRQF_ONESHOT ;
@@ -189,7 +189,7 @@ static struct regmap_irq_chip pm805_irq_chip = { .ack_base = PM805_INT_STATUS1, }; -static int __devinit device_805_init (struct pm80x_chip *chip) +static int device_805_init (struct pm80x_chip *chip) {int ret =0 ;unsigned int val;
@@ -232,7 +232,7 @@ out_irq_init:return ret; } -static int __devinit pm805_probe (struct i2c_client *client, +static int pm805_probe (struct i2c_client *client,const struct i2c_device_id *id) {int ret =0 ;
drivers/mfd/88pm80x.c +1 -1
@@ -31,7 +31,7 @@ const struct regmap_config pm80x_regmap_config = { };EXPORT_SYMBOL_GPL (pm80x_regmap_config); -int __devinit pm80x_init (struct i2c_client *client, +int pm80x_init (struct i2c_client *client,const struct i2c_device_id *id) {struct pm80x_chip *chip;
drivers/mfd/88pm860x-core.c +15 -15
@@ -565,7 +565,7 @@ static struct irq_domain_ops pm860x_irq_domain_ops = { .xlate = irq_domain_xlate_onetwocell, }; -static int __devinit device_irq_init (struct pm860x_chip *chip, +static int device_irq_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) { struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \
@@ -730,7 +730,7 @@ out: }EXPORT_SYMBOL (pm8606_osc_disable); -static void __devinit device_osc_init (struct i2c_client *i2c) +static void device_osc_init (struct i2c_client *i2c) {struct pm860x_chip *chip =i2c_get_clientdata (i2c);
@@ -745,7 +745,7 @@ static void __devinit device_osc_init(struct i2c_client *i2c) chip->osc_status =PM8606_REF_GP_OSC_OFF ; } -static void __devinit device_bk_init (struct pm860x_chip *chip, +static void device_bk_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) {int ret, i;
@@ -765,7 +765,7 @@ static void __devinit device_bk_init(struct pm860x_chip *chip,dev_err (chip->dev,"Failed to add backlight subdev\n" ); } -static void __devinit device_led_init (struct pm860x_chip *chip, +static void device_led_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) {int ret, i;
@@ -787,7 +787,7 @@ static void __devinit device_led_init(struct pm860x_chip *chip, } } -static void __devinit device_regulator_init (struct pm860x_chip *chip, +static void device_regulator_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) {int ret;
@@ -866,7 +866,7 @@ static void __devinit device_regulator_init(struct pm860x_chip *chip, } } -static void __devinit device_rtc_init (struct pm860x_chip *chip, +static void device_rtc_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) {int ret;
@@ -885,7 +885,7 @@ static void __devinit device_rtc_init(struct pm860x_chip *chip,dev_err (chip->dev,"Failed to add rtc subdev\n" ); } -static void __devinit device_touch_init (struct pm860x_chip *chip, +static void device_touch_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) {int ret;
@@ -904,7 +904,7 @@ static void __devinit device_touch_init(struct pm860x_chip *chip,dev_err (chip->dev,"Failed to add touch subdev\n" ); } -static void __devinit device_power_init (struct pm860x_chip *chip, +static void device_power_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) {int ret;
@@ -951,7 +951,7 @@ static void __devinit device_power_init(struct pm860x_chip *chip, } } -static void __devinit device_onkey_init (struct pm860x_chip *chip, +static void device_onkey_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) {int ret;
@@ -965,7 +965,7 @@ static void __devinit device_onkey_init(struct pm860x_chip *chip,dev_err (chip->dev,"Failed to add onkey subdev\n" ); } -static void __devinit device_codec_init (struct pm860x_chip *chip, +static void device_codec_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) {int ret;
@@ -979,7 +979,7 @@ static void __devinit device_codec_init(struct pm860x_chip *chip,dev_err (chip->dev,"Failed to add codec subdev\n" ); } -static void __devinit device_8607_init (struct pm860x_chip *chip, +static void device_8607_init (struct pm860x_chip *chip,struct i2c_client *i2c,struct pm860x_platform_data *pdata) {
@@ -1040,7 +1040,7 @@ out:return ; } -static void __devinit device_8606_init (struct pm860x_chip *chip, +static void device_8606_init (struct pm860x_chip *chip,struct i2c_client *i2c,struct pm860x_platform_data *pdata) {
@@ -1049,7 +1049,7 @@ static void __devinit device_8606_init(struct pm860x_chip *chip,device_led_init (chip, pdata); } -static int __devinit pm860x_device_init (struct pm860x_chip *chip, +static int pm860x_device_init (struct pm860x_chip *chip,struct pm860x_platform_data *pdata) { chip->core_irq =0 ;
@@ -1109,7 +1109,7 @@ static struct regmap_config pm860x_regmap_config = { .val_bits = 8, }; -static int __devinit pm860x_dt_init (struct device_node *np, +static int pm860x_dt_init (struct device_node *np,struct device *dev,struct pm860x_platform_data *pdata) {
@@ -1127,7 +1127,7 @@ static int __devinit pm860x_dt_init(struct device_node *np,return 0 ; } -static int __devinit pm860x_probe (struct i2c_client *client, +static int pm860x_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct pm860x_platform_data *pdata = client->dev.platform_data;
drivers/mfd/ab3100-core.c +2 -2
@@ -708,7 +708,7 @@ ab3100_init_settings[] = { }, }; -static int __devinit ab3100_setup (struct ab3100 *ab3100) +static int ab3100_setup (struct ab3100 *ab3100) {int err =0 ;int i;
@@ -857,7 +857,7 @@ static const struct ab_family_id ids[] __devinitconst = { }, }; -static int __devinit ab3100_probe (struct i2c_client *client, +static int ab3100_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct ab3100 *ab3100;
drivers/mfd/ab8500-core.c +1 -1
@@ -1207,7 +1207,7 @@ static struct attribute_group ab9540_attr_group = { .attrs = ab9540_sysfs_entries, }; -static int __devinit ab8500_probe (struct platform_device *pdev) +static int ab8500_probe (struct platform_device *pdev) {static char *switch_off_status[] = {"Swoff bit programming" ,
drivers/mfd/ab8500-debugfs.c +1 -1
@@ -552,7 +552,7 @@ static struct dentry *ab8500_bank_file;static struct dentry *ab8500_address_file;static struct dentry *ab8500_val_file; -static int __devinit ab8500_debug_probe (struct platform_device *plf) +static int ab8500_debug_probe (struct platform_device *plf) { debug_bank =AB8500_MISC ; debug_address =AB8500_REV_REG &0x00FF ;
drivers/mfd/ab8500-gpadc.c +1 -1
@@ -571,7 +571,7 @@ static void ab8500_gpadc_read_calibration_data(struct ab8500_gpadc *gpadc) gpadc->cal_data[ADC_INPUT_VBAT].offset); } -static int __devinit ab8500_gpadc_probe (struct platform_device *pdev) +static int ab8500_gpadc_probe (struct platform_device *pdev) {int ret =0 ;struct ab8500_gpadc *gpadc;
drivers/mfd/ab8500-sysctrl.c +1 -1
@@ -49,7 +49,7 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value) (u8)(reg & 0xFF), mask, value); } -static int __devinit ab8500_sysctrl_probe (struct platform_device *pdev) +static int ab8500_sysctrl_probe (struct platform_device *pdev) { sysctrl_dev = &pdev->dev;return 0 ;
drivers/mfd/adp5520.c +1 -1
@@ -203,7 +203,7 @@ static int adp5520_remove_subdevs(struct adp5520_chip *chip)return device_for_each_child (chip->dev,NULL , __remove_subdev); } -static int __devinit adp5520_probe (struct i2c_client *client, +static int adp5520_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct adp5520_platform_data *pdata = client->dev.platform_data;
drivers/mfd/arizona-core.c +1 -1
@@ -285,7 +285,7 @@ static struct mfd_cell wm5110_devs[] = { { .name = "wm5110-codec" }, }; -int __devinit arizona_dev_init (struct arizona *arizona) +int arizona_dev_init (struct arizona *arizona) {struct device *dev = arizona->dev;const char *type_name;
drivers/mfd/arizona-i2c.c +1 -1
@@ -22,7 +22,7 @@#include "arizona.h" -static __devinit int arizona_i2c_probe (struct i2c_client *i2c, +static int arizona_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct arizona *arizona;
drivers/mfd/arizona-spi.c +1 -1
@@ -22,7 +22,7 @@#include "arizona.h" -static int __devinit arizona_spi_probe (struct spi_device *spi) +static int arizona_spi_probe (struct spi_device *spi) {const struct spi_device_id *id =spi_get_device_id (spi);struct arizona *arizona;
drivers/mfd/cs5535-mfd.c +2 -2
@@ -113,7 +113,7 @@ static __devinitdata struct mfd_cell cs5535_mfd_cells[] = { };#ifdef CONFIG_OLPC -static void __devinit cs5535_clone_olpc_cells (void ) +static void cs5535_clone_olpc_cells (void ) {const char *acpi_clones[] = {"olpc-xo1-pm-acpi" ,"olpc-xo1-sci-acpi" };
@@ -126,7 +126,7 @@ static void __devinit cs5535_clone_olpc_cells(void)static void cs5535_clone_olpc_cells (void ) { }#endif -static int __devinit cs5535_mfd_probe (struct pci_dev *pdev, +static int cs5535_mfd_probe (struct pci_dev *pdev,const struct pci_device_id *id) {int err, i;
drivers/mfd/da903x.c +3 -3
@@ -246,7 +246,7 @@ int da903x_query_status(struct device *dev, unsigned int sbits) }EXPORT_SYMBOL (da903x_query_status); -static int __devinit da9030_init_chip (struct da903x_chip *chip) +static int da9030_init_chip (struct da903x_chip *chip) {uint8_t chip_id;int err;
@@ -459,7 +459,7 @@ static int da903x_remove_subdevs(struct da903x_chip *chip)return device_for_each_child (chip->dev,NULL , __remove_subdev); } -static int __devinit da903x_add_subdevs (struct da903x_chip *chip, +static int da903x_add_subdevs (struct da903x_chip *chip,struct da903x_platform_data *pdata) {struct da903x_subdev_info *subdev;
@@ -491,7 +491,7 @@ failed:return ret; } -static int __devinit da903x_probe (struct i2c_client *client, +static int da903x_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct da903x_platform_data *pdata = client->dev.platform_data;
drivers/mfd/da9052-core.c +1 -1
@@ -769,7 +769,7 @@ struct regmap_config da9052_regmap_config = { };EXPORT_SYMBOL_GPL (da9052_regmap_config); -int __devinit da9052_device_init (struct da9052 *da9052,u8 chip_id) +int da9052_device_init (struct da9052 *da9052,u8 chip_id) {struct da9052_pdata *pdata = da9052->dev->platform_data;int ret;
drivers/mfd/da9052-i2c.c +1 -1
@@ -64,7 +64,7 @@ static const struct of_device_id dialog_dt_ids[] = { };#endif -static int __devinit da9052_i2c_probe (struct i2c_client *client, +static int da9052_i2c_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct da9052 *da9052;
drivers/mfd/da9052-spi.c +1 -1
@@ -21,7 +21,7 @@#include <linux/mfd/da9052/da9052.h> -static int __devinit da9052_spi_probe (struct spi_device *spi) +static int da9052_spi_probe (struct spi_device *spi) {int ret;const struct spi_device_id *id =spi_get_device_id (spi);
drivers/mfd/da9055-core.c +1 -1
@@ -377,7 +377,7 @@ static struct regmap_irq_chip da9055_regmap_irq_chip = { .num_irqs = ARRAY_SIZE(da9055_irqs), }; -int __devinit da9055_device_init (struct da9055 *da9055) +int da9055_device_init (struct da9055 *da9055) {struct da9055_pdata *pdata = da9055->dev->platform_data;int ret;
drivers/mfd/da9055-i2c.c +1 -1
@@ -18,7 +18,7 @@#include <linux/mfd/da9055/core.h> -static int __devinit da9055_i2c_probe (struct i2c_client *i2c, +static int da9055_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct da9055 *da9055;
drivers/mfd/db8500-prcmu.c +1 -1
@@ -3098,7 +3098,7 @@ static void db8500_prcmu_update_cpufreq(void)* prcmu_fw_init - arch init call for the Linux PRCMU fw init logic * */ -static int __devinit db8500_prcmu_probe (struct platform_device *pdev) +static int db8500_prcmu_probe (struct platform_device *pdev) {struct ab8500_platform_data *ab8500_platdata = pdev->dev.platform_data;struct device_node *np = pdev->dev.of_node;
drivers/mfd/ezx-pcap.c +2 -2
@@ -371,7 +371,7 @@ static int pcap_remove_subdev(struct device *dev, void *unused)return 0 ; } -static int __devinit pcap_add_subdev (struct pcap_chip *pcap, +static int pcap_add_subdev (struct pcap_chip *pcap,struct pcap_subdev *subdev) {struct platform_device *pdev;
@@ -420,7 +420,7 @@ static int __devexit ezx_pcap_remove(struct spi_device *spi)return 0 ; } -static int __devinit ezx_pcap_probe (struct spi_device *spi) +static int ezx_pcap_probe (struct spi_device *spi) {struct pcap_platform_data *pdata = spi->dev.platform_data;struct pcap_chip *pcap;
drivers/mfd/htc-i2cpld.c +6 -6
@@ -327,7 +327,7 @@ static void htcpld_chip_reset(struct i2c_client *client) client, (chip_data->cache_out = chip_data->reset)); } -static int __devinit htcpld_setup_chip_irq ( +static int htcpld_setup_chip_irq (struct platform_device *pdev,int chip_index) {
@@ -361,7 +361,7 @@ static int __devinit htcpld_setup_chip_irq(return ret; } -static int __devinit htcpld_register_chip_i2c ( +static int htcpld_register_chip_i2c (struct platform_device *pdev,int chip_index) {
@@ -419,7 +419,7 @@ static int __devinit htcpld_register_chip_i2c(return 0 ; } -static void __devinit htcpld_unregister_chip_i2c ( +static void htcpld_unregister_chip_i2c (struct platform_device *pdev,int chip_index) {
@@ -434,7 +434,7 @@ static void __devinit htcpld_unregister_chip_i2c(i2c_unregister_device (chip->client); } -static int __devinit htcpld_register_chip_gpio ( +static int htcpld_register_chip_gpio (struct platform_device *pdev,int chip_index) {
@@ -501,7 +501,7 @@ static int __devinit htcpld_register_chip_gpio(return 0 ; } -static int __devinit htcpld_setup_chips (struct platform_device *pdev) +static int htcpld_setup_chips (struct platform_device *pdev) {struct htcpld_data *htcpld;struct device *dev = &pdev->dev;
@@ -563,7 +563,7 @@ static int __devinit htcpld_setup_chips(struct platform_device *pdev)return 0 ; } -static int __devinit htcpld_core_probe (struct platform_device *pdev) +static int htcpld_core_probe (struct platform_device *pdev) {struct htcpld_data *htcpld;struct device *dev = &pdev->dev;
drivers/mfd/intel_msic.c +2 -2
@@ -306,7 +306,7 @@ int intel_msic_irq_read(struct intel_msic *msic, unsigned short reg, u8 *val) }EXPORT_SYMBOL_GPL (intel_msic_irq_read); -static int __devinit intel_msic_init_devices (struct intel_msic *msic) +static int intel_msic_init_devices (struct intel_msic *msic) {struct platform_device *pdev = msic->pdev;struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
@@ -375,7 +375,7 @@ static void __devexit intel_msic_remove_devices(struct intel_msic *msic)gpio_free (pdata->ocd->gpio); } -static int __devinit intel_msic_probe (struct platform_device *pdev) +static int intel_msic_probe (struct platform_device *pdev) {struct intel_msic_platform_data *pdata = pdev->dev.platform_data;struct intel_msic *msic;
drivers/mfd/janz-cmodio.c +3 -3
@@ -63,7 +63,7 @@ struct cmodio_device {* Subdevices using the mfd-core API */ -static int __devinit cmodio_setup_subdevice (struct cmodio_device *priv, +static int cmodio_setup_subdevice (struct cmodio_device *priv,char *name,unsigned int devno,unsigned int modno) {
@@ -120,7 +120,7 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv, }/* Probe each submodule using kernel parameters */ -static int __devinit cmodio_probe_submodules (struct cmodio_device *priv) +static int cmodio_probe_submodules (struct cmodio_device *priv) {struct pci_dev *pdev = priv->pdev;unsigned int num_probed =0 ;
@@ -177,7 +177,7 @@ static const struct attribute_group cmodio_sysfs_attr_group = {* PCI Driver */ -static int __devinit cmodio_pci_probe (struct pci_dev *dev, +static int cmodio_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) {struct cmodio_device *priv;
drivers/mfd/jz4740-adc.c +1 -1
@@ -202,7 +202,7 @@ static struct mfd_cell jz4740_adc_cells[] = { }, }; -static int __devinit jz4740_adc_probe (struct platform_device *pdev) +static int jz4740_adc_probe (struct platform_device *pdev) {struct irq_chip_generic *gc;struct irq_chip_type *ct;
drivers/mfd/lm3533-core.c +6 -6
@@ -382,7 +382,7 @@ static struct attribute_group lm3533_attribute_group = { .attrs = lm3533_attributes }; -static int __devinit lm3533_device_als_init (struct lm3533 *lm3533) +static int lm3533_device_als_init (struct lm3533 *lm3533) {struct lm3533_platform_data *pdata = lm3533->dev->platform_data;int ret;
@@ -405,7 +405,7 @@ static int __devinit lm3533_device_als_init(struct lm3533 *lm3533)return 0 ; } -static int __devinit lm3533_device_bl_init (struct lm3533 *lm3533) +static int lm3533_device_bl_init (struct lm3533 *lm3533) {struct lm3533_platform_data *pdata = lm3533->dev->platform_data;int i;
@@ -434,7 +434,7 @@ static int __devinit lm3533_device_bl_init(struct lm3533 *lm3533)return 0 ; } -static int __devinit lm3533_device_led_init (struct lm3533 *lm3533) +static int lm3533_device_led_init (struct lm3533 *lm3533) {struct lm3533_platform_data *pdata = lm3533->dev->platform_data;int i;
@@ -463,7 +463,7 @@ static int __devinit lm3533_device_led_init(struct lm3533 *lm3533)return 0 ; } -static int __devinit lm3533_device_setup (struct lm3533 *lm3533, +static int lm3533_device_setup (struct lm3533 *lm3533,struct lm3533_platform_data *pdata) {int ret;
@@ -479,7 +479,7 @@ static int __devinit lm3533_device_setup(struct lm3533 *lm3533,return 0 ; } -static int __devinit lm3533_device_init (struct lm3533 *lm3533) +static int lm3533_device_init (struct lm3533 *lm3533) {struct lm3533_platform_data *pdata = lm3533->dev->platform_data;int ret;
@@ -596,7 +596,7 @@ static struct regmap_config regmap_config = { .precious_reg = lm3533_precious_register, }; -static int __devinit lm3533_i2c_probe (struct i2c_client *i2c, +static int lm3533_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct lm3533 *lm3533;
drivers/mfd/lpc_ich.c +7 -7
@@ -672,7 +672,7 @@ static void lpc_ich_restore_config_space(struct pci_dev *dev) } } -static void __devinit lpc_ich_enable_acpi_space (struct pci_dev *dev) +static void lpc_ich_enable_acpi_space (struct pci_dev *dev) {u8 reg_save;
@@ -681,7 +681,7 @@ static void __devinit lpc_ich_enable_acpi_space(struct pci_dev *dev) lpc_ich_acpi_save = reg_save; } -static void __devinit lpc_ich_enable_gpio_space (struct pci_dev *dev) +static void lpc_ich_enable_gpio_space (struct pci_dev *dev) {u8 reg_save;
@@ -690,7 +690,7 @@ static void __devinit lpc_ich_enable_gpio_space(struct pci_dev *dev) lpc_ich_gpio_save = reg_save; } -static void __devinit lpc_ich_finalize_cell (struct mfd_cell *cell, +static void lpc_ich_finalize_cell (struct mfd_cell *cell,const struct pci_device_id *id) { cell->platform_data = &lpc_chipset_info[id->driver_data];
@@ -702,7 +702,7 @@ static void __devinit lpc_ich_finalize_cell(struct mfd_cell *cell,* GPIO groups and it's enough to have access to one of these to instantiate * the device. */ -static int __devinit lpc_ich_check_conflict_gpio (struct resource *res) +static int lpc_ich_check_conflict_gpio (struct resource *res) {int ret;u8 use_gpio =0 ;
@@ -721,7 +721,7 @@ static int __devinit lpc_ich_check_conflict_gpio(struct resource *res)return use_gpio ? use_gpio : ret; } -static int __devinit lpc_ich_init_gpio (struct pci_dev *dev, +static int lpc_ich_init_gpio (struct pci_dev *dev,const struct pci_device_id *id) {u32 base_addr_cfg;
@@ -798,7 +798,7 @@ gpio_done:return ret; } -static int __devinit lpc_ich_init_wdt (struct pci_dev *dev, +static int lpc_ich_init_wdt (struct pci_dev *dev,const struct pci_device_id *id) {u32 base_addr_cfg;
@@ -852,7 +852,7 @@ wdt_done:return ret; } -static int __devinit lpc_ich_probe (struct pci_dev *dev, +static int lpc_ich_probe (struct pci_dev *dev,const struct pci_device_id *id) {int ret;
drivers/mfd/lpc_sch.c +1 -1
@@ -83,7 +83,7 @@ static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = { };MODULE_DEVICE_TABLE (pci, lpc_sch_ids); -static int __devinit lpc_sch_probe (struct pci_dev *dev, +static int lpc_sch_probe (struct pci_dev *dev,const struct pci_device_id *id) {unsigned int base_addr_cfg;
drivers/mfd/max8907.c +1 -1
@@ -183,7 +183,7 @@ static void max8907_power_off(void) MAX8907_MASK_POWER_OFF, MAX8907_MASK_POWER_OFF); } -static __devinit int max8907_i2c_probe (struct i2c_client *i2c, +static int max8907_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct max8907 *max8907;
drivers/mfd/max8925-core.c +2 -2
@@ -714,7 +714,7 @@ tsc_irq:return 0 ; } -static void __devinit init_regulator (struct max8925_chip *chip, +static void init_regulator (struct max8925_chip *chip,struct max8925_platform_data *pdata) {int ret;
@@ -821,7 +821,7 @@ static void __devinit init_regulator(struct max8925_chip *chip, } } -int __devinit max8925_device_init (struct max8925_chip *chip, +int max8925_device_init (struct max8925_chip *chip,struct max8925_platform_data *pdata) {int ret;
drivers/mfd/max8925-i2c.c +1 -1
@@ -135,7 +135,7 @@ static const struct i2c_device_id max8925_id_table[] = { };MODULE_DEVICE_TABLE (i2c, max8925_id_table); -static int __devinit max8925_probe (struct i2c_client *client, +static int max8925_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct max8925_platform_data *pdata = client->dev.platform_data;
drivers/mfd/omap-usb-host.c +1 -1
@@ -467,7 +467,7 @@ static void omap_usbhs_deinit(struct device *dev)* * Allocates basic resources for this USB host controller. */ -static int __devinit usbhs_omap_probe (struct platform_device *pdev) +static int usbhs_omap_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct usbhs_omap_platform_data *pdata = dev->platform_data;
drivers/mfd/omap-usb-tll.c +1 -1
@@ -200,7 +200,7 @@ static unsigned ohci_omap3_fslsmode(enum usbhs_omap_port_mode mode)* * Allocates basic resources for this USB host controller. */ -static int __devinit usbtll_omap_probe (struct platform_device *pdev) +static int usbtll_omap_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct usbtll_omap_platform_data *pdata = dev->platform_data;
drivers/mfd/palmas.c +2 -2
@@ -247,7 +247,7 @@ static struct regmap_irq_chip palmas_irq_chip = { PALMAS_INT1_MASK), }; -static void __devinit palmas_dt_to_pdata (struct device_node *node, +static void palmas_dt_to_pdata (struct device_node *node,struct palmas_platform_data *pdata) {int ret;
@@ -275,7 +275,7 @@ static void __devinit palmas_dt_to_pdata(struct device_node *node,PALMAS_POWER_CTRL_ENABLE2_MASK ; } -static int __devinit palmas_i2c_probe (struct i2c_client *i2c, +static int palmas_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct palmas *palmas;
drivers/mfd/pcf50633-adc.c +1 -1
@@ -199,7 +199,7 @@ static void pcf50633_adc_irq(int irq, void *data)kfree (req); } -static int __devinit pcf50633_adc_probe (struct platform_device *pdev) +static int pcf50633_adc_probe (struct platform_device *pdev) {struct pcf50633_adc *adc;
drivers/mfd/pcf50633-core.c +1 -1
@@ -191,7 +191,7 @@ static struct regmap_config pcf50633_regmap_config = { .val_bits = 8, }; -static int __devinit pcf50633_probe (struct i2c_client *client, +static int pcf50633_probe (struct i2c_client *client,const struct i2c_device_id *ids) {struct pcf50633 *pcf;
drivers/mfd/pm8921-core.c +2 -2
@@ -80,7 +80,7 @@ static struct pm8xxx_drvdata pm8921_drvdata = { .pmic_read_irq_stat = pm8921_read_irq_stat, }; -static int __devinit pm8921_add_subdevices (const struct pm8921_platform_data +static int pm8921_add_subdevices (const struct pm8921_platform_data *pdata,struct pm8921 *pmic,u32 rev)
@@ -104,7 +104,7 @@ static int __devinit pm8921_add_subdevices(const struct pm8921_platform_datareturn ret; } -static int __devinit pm8921_probe (struct platform_device *pdev) +static int pm8921_probe (struct platform_device *pdev) {const struct pm8921_platform_data *pdata = pdev->dev.platform_data;struct pm8921 *pmic;
drivers/mfd/pm8xxx-irq.c +1 -1
@@ -309,7 +309,7 @@ bail_out: }EXPORT_SYMBOL_GPL (pm8xxx_get_irq_stat); -struct pm_irq_chip *__devinit pm8xxx_irq_init (struct device *dev, +struct pm_irq_chip *pm8xxx_irq_init (struct device *dev,const struct pm8xxx_irq_platform_data *pdata) {struct pm_irq_chip *chip;
drivers/mfd/rc5t583.c +1 -1
@@ -246,7 +246,7 @@ static const struct regmap_config rc5t583_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static int __devinit rc5t583_i2c_probe (struct i2c_client *i2c, +static int rc5t583_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct rc5t583 *rc5t583;
drivers/mfd/rdc321x-southbridge.c +1 -1
@@ -72,7 +72,7 @@ static struct mfd_cell rdc321x_sb_cells[] = { }, }; -static int __devinit rdc321x_sb_probe (struct pci_dev *pdev, +static int rdc321x_sb_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {int err;
drivers/mfd/rtsx_pcr.c +1 -1
@@ -998,7 +998,7 @@ static int rtsx_pci_init_chip(struct rtsx_pcr *pcr)return 0 ; } -static int __devinit rtsx_pci_probe (struct pci_dev *pcidev, +static int rtsx_pci_probe (struct pci_dev *pcidev,const struct pci_device_id *id) {struct rtsx_pcr *pcr;
drivers/mfd/sm501.c +5 -5
@@ -1014,7 +1014,7 @@ static struct gpio_chip gpio_chip_template = { .get = sm501_gpio_get, }; -static int __devinit sm501_gpio_register_chip (struct sm501_devdata *sm, +static int sm501_gpio_register_chip (struct sm501_devdata *sm,struct sm501_gpio *gpio,struct sm501_gpio_chip *chip) {
@@ -1042,7 +1042,7 @@ static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm,return gpiochip_add (gchip); } -static int __devinit sm501_register_gpio (struct sm501_devdata *sm) +static int sm501_register_gpio (struct sm501_devdata *sm) {struct sm501_gpio *gpio = &sm->gpio;resource_size_t iobase = sm->io_res->start +SM501_GPIO ;
@@ -1313,7 +1313,7 @@ static unsigned int sm501_mem_local[] = {* Common init code for an SM501 */ -static int __devinit sm501_init_dev (struct sm501_devdata *sm) +static int sm501_init_dev (struct sm501_devdata *sm) {struct sm501_initdata *idata;struct sm501_platdata *pdata;
@@ -1389,7 +1389,7 @@ static int __devinit sm501_init_dev(struct sm501_devdata *sm)return 0 ; } -static int __devinit sm501_plat_probe (struct platform_device *dev) +static int sm501_plat_probe (struct platform_device *dev) {struct sm501_devdata *sm;int ret;
@@ -1578,7 +1578,7 @@ static struct sm501_platdata sm501_pci_platdata = { .gpio_base = -1, }; -static int __devinit sm501_pci_probe (struct pci_dev *dev, +static int sm501_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) {struct sm501_devdata *sm;
drivers/mfd/sta2x11-mfd.c +2 -2
@@ -69,7 +69,7 @@ static struct sta2x11_mfd *sta2x11_mfd_find(struct pci_dev *pdev)return NULL ; } -static int __devinit sta2x11_mfd_add (struct pci_dev *pdev,gfp_t flags) +static int sta2x11_mfd_add (struct pci_dev *pdev,gfp_t flags) {struct sta2x11_mfd *mfd =sta2x11_mfd_find (pdev);struct sta2x11_instance *instance;
@@ -363,7 +363,7 @@ static int sta2x11_mfd_resume(struct pci_dev *pdev)return 0 ; } -static int __devinit sta2x11_mfd_probe (struct pci_dev *pdev, +static int sta2x11_mfd_probe (struct pci_dev *pdev,const struct pci_device_id *pci_id) {int err, i;
drivers/mfd/stmpe-i2c.c +1 -1
@@ -52,7 +52,7 @@ static struct stmpe_client_info i2c_ci = { .write_block = i2c_block_write, }; -static int __devinit +static int stmpe_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) { i2c_ci.data = (void *)id;
drivers/mfd/stmpe-spi.c +1 -1
@@ -82,7 +82,7 @@ static struct stmpe_client_info spi_ci = { .init = spi_init, }; -static int __devinit +static int stmpe_spi_probe (struct spi_device *spi) {const struct spi_device_id *id =spi_get_device_id (spi);
drivers/mfd/stmpe.c +6 -6
@@ -885,7 +885,7 @@ static struct irq_domain_ops stmpe_irq_ops = { .xlate = irq_domain_xlate_twocell, }; -static int __devinit stmpe_irq_init (struct stmpe *stmpe, +static int stmpe_irq_init (struct stmpe *stmpe,struct device_node *np) {int base = stmpe->irq_base;
@@ -908,7 +908,7 @@ static int __devinit stmpe_irq_init(struct stmpe *stmpe,return 0 ; } -static int __devinit stmpe_chip_init (struct stmpe *stmpe) +static int stmpe_chip_init (struct stmpe *stmpe) {unsigned int irq_trigger = stmpe->pdata->irq_trigger;int autosleep_timeout = stmpe->pdata->autosleep_timeout;
@@ -974,14 +974,14 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe)return stmpe_reg_write (stmpe, stmpe->regs[STMPE_IDX_ICR_LSB ], icr); } -static int __devinit stmpe_add_device (struct stmpe *stmpe, +static int stmpe_add_device (struct stmpe *stmpe,struct mfd_cell *cell) {return mfd_add_devices (stmpe->dev, stmpe->pdata->id, cell,1 ,NULL , stmpe->irq_base, stmpe->domain); } -static int __devinit stmpe_devices_init (struct stmpe *stmpe) +static int stmpe_devices_init (struct stmpe *stmpe) {struct stmpe_variant_info *variant = stmpe->variant;unsigned int platform_blocks = stmpe->pdata->blocks;
@@ -1017,7 +1017,7 @@ static int __devinit stmpe_devices_init(struct stmpe *stmpe)return ret; } -void __devinit stmpe_of_probe (struct stmpe_platform_data *pdata, +void stmpe_of_probe (struct stmpe_platform_data *pdata,struct device_node *np) {struct device_node *child;
@@ -1044,7 +1044,7 @@ void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata, }/* Called from client specific probe routines */ -int __devinit stmpe_probe (struct stmpe_client_info *ci,int partnum) +int stmpe_probe (struct stmpe_client_info *ci,int partnum) {struct stmpe_platform_data *pdata =dev_get_platdata (ci->dev);struct device_node *np = ci->dev->of_node;
drivers/mfd/syscon.c +1 -1
@@ -97,7 +97,7 @@ static struct regmap_config syscon_regmap_config = { .reg_stride = 4, }; -static int __devinit syscon_probe (struct platform_device *pdev) +static int syscon_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct device_node *np = dev->of_node;
drivers/mfd/tc3589x.c +2 -2
@@ -282,7 +282,7 @@ static int tc3589x_chip_init(struct tc3589x *tc3589x)return tc3589x_reg_write (tc3589x, TC3589x_RSTINTCLR,0x1 ); } -static int __devinit tc3589x_device_init (struct tc3589x *tc3589x) +static int tc3589x_device_init (struct tc3589x *tc3589x) {int ret =0 ;unsigned int blocks = tc3589x->pdata->block;
@@ -329,7 +329,7 @@ static int tc3589x_of_probe(struct device_node *np,return 0 ; } -static int __devinit tc3589x_probe (struct i2c_client *i2c, +static int tc3589x_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct tc3589x_platform_data *pdata = i2c->dev.platform_data;
drivers/mfd/tc6387xb.c +1 -1
@@ -138,7 +138,7 @@ static struct mfd_cell tc6387xb_cells[] = { }, }; -static int __devinit tc6387xb_probe (struct platform_device *dev) +static int tc6387xb_probe (struct platform_device *dev) {struct tc6387xb_platform_data *pdata = dev->dev.platform_data;struct resource *iomem, *rscr;
drivers/mfd/tc6393xb.c +1 -1
@@ -602,7 +602,7 @@ static void tc6393xb_detach_irq(struct platform_device *dev)/*--------------------------------------------------------------------------*/ -static int __devinit tc6393xb_probe (struct platform_device *dev) +static int tc6393xb_probe (struct platform_device *dev) {struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;struct tc6393xb *tc6393xb;
drivers/mfd/ti-ssp.c +1 -1
@@ -315,7 +315,7 @@ static irqreturn_t ti_ssp_interrupt(int irq, void *dev_data)return IRQ_HANDLED ; } -static int __devinit ti_ssp_probe (struct platform_device *pdev) +static int ti_ssp_probe (struct platform_device *pdev) {static struct ti_ssp *ssp;const struct ti_ssp_data *pdata = pdev->dev.platform_data;
drivers/mfd/ti_am335x_tscadc.c +1 -1
@@ -58,7 +58,7 @@ static void tscadc_idle_config(struct ti_tscadc_dev *config)tscadc_writel (config,REG_IDLECONFIG , idleconfig); } -static int __devinit ti_tscadc_probe (struct platform_device *pdev) +static int ti_tscadc_probe (struct platform_device *pdev) {struct ti_tscadc_dev *tscadc;struct resource *res;
drivers/mfd/timberdale.c +1 -1
@@ -650,7 +650,7 @@ static DEVICE_ATTR(fw_ver, S_IRUGO, show_fw_ver, NULL);/*--------------------------------------------------------------------------*/ -static int __devinit timb_probe (struct pci_dev *dev, +static int timb_probe (struct pci_dev *dev,const struct pci_device_id *id) {struct timberdale_device *priv;
drivers/mfd/tps6105x.c +2 -2
@@ -86,7 +86,7 @@ fail: }EXPORT_SYMBOL (tps6105x_mask_and_set); -static int __devinit tps6105x_startup (struct tps6105x *tps6105x) +static int tps6105x_startup (struct tps6105x *tps6105x) {int ret;u8 regval;
@@ -133,7 +133,7 @@ static struct mfd_cell tps6105x_cells[] = { }, }; -static int __devinit tps6105x_probe (struct i2c_client *client, +static int tps6105x_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct tps6105x *tps6105x;
drivers/mfd/tps65090.c +2 -2
@@ -188,7 +188,7 @@ static irqreturn_t tps65090_irq(int irq, void *data)return acks ?IRQ_HANDLED :IRQ_NONE ; } -static int __devinit tps65090_irq_init (struct tps65090 *tps65090,int irq, +static int tps65090_irq_init (struct tps65090 *tps65090,int irq,int irq_base) {int i, ret;
@@ -251,7 +251,7 @@ static const struct regmap_config tps65090_regmap_config = { .volatile_reg = is_volatile_reg, }; -static int __devinit tps65090_i2c_probe (struct i2c_client *client, +static int tps65090_i2c_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct tps65090_platform_data *pdata = client->dev.platform_data;
drivers/mfd/tps65217.c +1 -1
@@ -153,7 +153,7 @@ static const struct of_device_id tps65217_of_match[] = { { /* sentinel */ }, }; -static int __devinit tps65217_probe (struct i2c_client *client, +static int tps65217_probe (struct i2c_client *client,const struct i2c_device_id *ids) {struct tps65217 *tps;
drivers/mfd/tps6586x.c +3 -3
@@ -322,7 +322,7 @@ static irqreturn_t tps6586x_irq(int irq, void *data)return IRQ_HANDLED ; } -static int __devinit tps6586x_irq_init (struct tps6586x *tps6586x,int irq, +static int tps6586x_irq_init (struct tps6586x *tps6586x,int irq,int irq_base) {int i, ret;
@@ -367,7 +367,7 @@ static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq,return ret; } -static int __devinit tps6586x_add_subdevs (struct tps6586x *tps6586x, +static int tps6586x_add_subdevs (struct tps6586x *tps6586x,struct tps6586x_platform_data *pdata) {struct tps6586x_subdev_info *subdev;
@@ -519,7 +519,7 @@ static void tps6586x_power_off(void)tps6586x_set_bits (tps6586x_dev,TPS6586X_SUPPLYENE ,SLEEP_MODE_BIT ); } -static int __devinit tps6586x_i2c_probe (struct i2c_client *client, +static int tps6586x_i2c_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct tps6586x_platform_data *pdata = client->dev.platform_data;
drivers/mfd/tps65910.c +3 -3
@@ -78,7 +78,7 @@ static const struct regmap_config tps65910_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static int __devinit tps65910_ck32k_init (struct tps65910 *tps65910, +static int tps65910_ck32k_init (struct tps65910 *tps65910,struct tps65910_board *pmic_pdata) {int ret;
@@ -96,7 +96,7 @@ static int __devinit tps65910_ck32k_init(struct tps65910 *tps65910,return 0 ; } -static int __devinit tps65910_sleepinit (struct tps65910 *tps65910, +static int tps65910_sleepinit (struct tps65910 *tps65910,struct tps65910_board *pmic_pdata) {struct device *dev =NULL ;
@@ -237,7 +237,7 @@ static void tps65910_power_off(void) DEVCTRL_DEV_ON_MASK); } -static __devinit int tps65910_i2c_probe (struct i2c_client *i2c, +static int tps65910_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct tps65910 *tps65910;
drivers/mfd/tps65911-comparator.c +1 -1
@@ -122,7 +122,7 @@ static ssize_t comp_threshold_show(struct device *dev, static DEVICE_ATTR(comp1_threshold, S_IRUGO, comp_threshold_show, NULL); static DEVICE_ATTR(comp2_threshold, S_IRUGO, comp_threshold_show, NULL); -static __devinit int tps65911_comparator_probe (struct platform_device *pdev) +static int tps65911_comparator_probe (struct platform_device *pdev) {struct tps65910 *tps65910 =dev_get_drvdata (pdev->dev.parent);struct tps65910_board *pdata =dev_get_platdata (tps65910->dev);
drivers/mfd/tps65912-spi.c +1 -1
@@ -81,7 +81,7 @@ static int tps65912_spi_read(struct tps65912 *tps65912, u8 addr,return ret; } -static int __devinit tps65912_spi_probe (struct spi_device *spi) +static int tps65912_spi_probe (struct spi_device *spi) {struct tps65912 *tps65912;
drivers/mfd/twl-core.c +1 -1
@@ -1170,7 +1170,7 @@ static int twl_remove(struct i2c_client *client) }/* NOTE: This driver only handles a single twl4030/tps659x0 chip */ -static int __devinit +static int twl_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct twl4030_platform_data *pdata = client->dev.platform_data;
drivers/mfd/twl4030-audio.c +1 -1
@@ -184,7 +184,7 @@ static bool twl4030_audio_has_vibra(struct twl4030_audio_data *pdata,return false; } -static int __devinit twl4030_audio_probe (struct platform_device *pdev) +static int twl4030_audio_probe (struct platform_device *pdev) {struct twl4030_audio *audio;struct twl4030_audio_data *pdata = pdev->dev.platform_data;
drivers/mfd/twl4030-madc.c +1 -1
@@ -692,7 +692,7 @@ static int twl4030_madc_set_power(struct twl4030_madc_data *madc, int on)/* * Initialize MADC and request for threaded irq */ -static int __devinit twl4030_madc_probe (struct platform_device *pdev) +static int twl4030_madc_probe (struct platform_device *pdev) {struct twl4030_madc_data *madc;struct twl4030_madc_platform_data *pdata = pdev->dev.platform_data;
drivers/mfd/twl4030-power.c +10 -10
@@ -124,7 +124,7 @@ static u8 res_config_addrs[] = { [RES_MAIN_REF] = 0x94, }; -static int __devinit twl4030_write_script_byte (u8 address,u8 byte) +static int twl4030_write_script_byte (u8 address,u8 byte) {int err;
@@ -138,7 +138,7 @@ out:return err; } -static int __devinit twl4030_write_script_ins (u8 address,u16 pmb_message, +static int twl4030_write_script_ins (u8 address,u16 pmb_message,u8 delay,u8 next) {int err;
@@ -158,7 +158,7 @@ out:return err; } -static int __devinit twl4030_write_script (u8 address,struct twl4030_ins *script, +static int twl4030_write_script (u8 address,struct twl4030_ins *script,int len) {int err;
@@ -183,7 +183,7 @@ static int __devinit twl4030_write_script(u8 address, struct twl4030_ins *scriptreturn err; } -static int __devinit twl4030_config_wakeup3_sequence (u8 address) +static int twl4030_config_wakeup3_sequence (u8 address) {int err;u8 data;
@@ -208,7 +208,7 @@ out:return err; } -static int __devinit twl4030_config_wakeup12_sequence (u8 address) +static int twl4030_config_wakeup12_sequence (u8 address) {int err =0 ;u8 data;
@@ -262,7 +262,7 @@ out:return err; } -static int __devinit twl4030_config_sleep_sequence (u8 address) +static int twl4030_config_sleep_sequence (u8 address) {int err;
@@ -276,7 +276,7 @@ static int __devinit twl4030_config_sleep_sequence(u8 address)return err; } -static int __devinit twl4030_config_warmreset_sequence (u8 address) +static int twl4030_config_warmreset_sequence (u8 address) {int err;u8 rd_data;
@@ -324,7 +324,7 @@ out:return err; } -static int __devinit twl4030_configure_resource (struct twl4030_resconfig *rconfig) +static int twl4030_configure_resource (struct twl4030_resconfig *rconfig) {int rconfig_addr;int err;
@@ -416,7 +416,7 @@ static int __devinit twl4030_configure_resource(struct twl4030_resconfig *rconfireturn 0 ; } -static int __devinit load_twl4030_script (struct twl4030_script *tscript, +static int load_twl4030_script (struct twl4030_script *tscript,u8 address) {int err;
@@ -527,7 +527,7 @@ void twl4030_power_off(void)pr_err ("TWL4030 Unable to power off\n" ); } -void __devinit twl4030_power_init (struct twl4030_power_data *twl4030_scripts) +void twl4030_power_init (struct twl4030_power_data *twl4030_scripts) {int err =0 ;int i;
drivers/mfd/twl6040.c +2 -2
@@ -518,8 +518,8 @@ static struct regmap_irq_chip twl6040_irq_chip = { .mask_base = TWL6040_REG_INTMR, }; -static int __devinit twl6040_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int twl6040_probe (struct i2c_client *client, +const struct i2c_device_id *id) {struct twl6040_platform_data *pdata = client->dev.platform_data;struct device_node *node = client->dev.of_node;
drivers/mfd/vexpress-sysreg.c +1 -1
@@ -414,7 +414,7 @@ static ssize_t vexpress_sysreg_sys_id_show(struct device *dev,DEVICE_ATTR (sys_id,S_IRUGO , vexpress_sysreg_sys_id_show,NULL ); -static int __devinit vexpress_sysreg_probe (struct platform_device *pdev) +static int vexpress_sysreg_probe (struct platform_device *pdev) {int err; struct resource *res = platform_get_resource(pdev,
drivers/mfd/vx855.c +1 -1
@@ -72,7 +72,7 @@ static struct mfd_cell vx855_cells[] = { }, }; -static __devinit int vx855_probe (struct pci_dev *pdev, +static int vx855_probe (struct pci_dev *pdev,const struct pci_device_id *id) {int ret;
drivers/mfd/wl1273-core.c +1 -1
@@ -182,7 +182,7 @@ static int wl1273_core_remove(struct i2c_client *client)return 0 ; } -static int __devinit wl1273_core_probe (struct i2c_client *client, +static int wl1273_core_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct wl1273_fm_platform_data *pdata = client->dev.platform_data;
drivers/mfd/wm831x-spi.c +1 -1
@@ -21,7 +21,7 @@#include <linux/mfd/wm831x/core.h> -static int __devinit wm831x_spi_probe (struct spi_device *spi) +static int wm831x_spi_probe (struct spi_device *spi) {const struct spi_device_id *id =spi_get_device_id (spi);struct wm831x *wm831x;
drivers/mfd/wm8994-core.c +2 -2
@@ -399,7 +399,7 @@ static const __devinitconst struct reg_default wm1811_reva_patch[] = {/* * Instantiate the generic non-control parts of the device. */ -static __devinit int wm8994_device_init (struct wm8994 *wm8994,int irq) +static int wm8994_device_init (struct wm8994 *wm8994,int irq) {struct wm8994_pdata *pdata = wm8994->dev->platform_data;struct regmap_config *regmap_config;
@@ -689,7 +689,7 @@ static const struct of_device_id wm8994_of_match[] = { };MODULE_DEVICE_TABLE (of, wm8994_of_match); -static __devinit int wm8994_i2c_probe (struct i2c_client *i2c, +static int wm8994_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct wm8994 *wm8994;
include/linux/mfd/88pm80x.h +1 -1
@@ -364,6 +364,6 @@ static inline int pm80x_dev_resume(struct device *dev)#endif extern int pm80x_init (struct i2c_client *client, -const struct i2c_device_id *id)__devinit ; +const struct i2c_device_id *id);extern int pm80x_deinit (struct i2c_client *client);#endif /* __LINUX_MFD_88PM80X_H */
include/linux/mfd/abx500/ab8500.h +1 -1
@@ -291,7 +291,7 @@ struct ab8500_platform_data {struct ab8500_codec_platform_data *codec; }; -extern int __devinit ab8500_init (struct ab8500 *ab8500, +extern int ab8500_init (struct ab8500 *ab8500,enum ab8500_version version); extern int __devexit ab8500_exit(struct ab8500 *ab8500);
include/linux/mfd/pm8xxx/irq.h +2 -2
@@ -37,7 +37,7 @@ struct pm_irq_chip;#ifdef CONFIG_MFD_PM8XXX_IRQ int pm8xxx_get_irq_stat (struct pm_irq_chip *chip,int irq); -struct pm_irq_chip *__devinit pm8xxx_irq_init (struct device *dev, +struct pm_irq_chip *pm8xxx_irq_init (struct device *dev,const struct pm8xxx_irq_platform_data *pdata); int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip);#else
@@ -45,7 +45,7 @@ static inline int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq) {return -ENXIO ; } -static inline struct pm_irq_chip *__devinit pm8xxx_irq_init ( +static inline struct pm_irq_chip *pm8xxx_irq_init (const struct device *dev,const struct pm8xxx_irq_platform_data *pdata) {
Signature · 1 line
1.8.0
PATCH 235/493 mfd: remove use of __devinit
Quoted 2 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.
Acked-by Mark Brown <[email protected]>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121120/4395f67e/attachment.sig>
PATCH 235/493 mfd: remove use of __devinit
In reply to Bill PembertonQuoted 8 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.Signed-off-by Bill Pemberton <[email protected]>--- drivers/mfd/pm8921-core.c | 4 ++-- drivers/mfd/pm8xxx-irq.c | 2 +- include/linux/mfd/pm8xxx/irq.h | 4 ++--
Acked-by David Brown <[email protected]>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 237/493 mmc: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Ludovic Desroches <[email protected]>
Cc Chris Ball <[email protected]>
Cc Manuel Lauss <[email protected]>
Cc "Micha? Miros?aw" <[email protected]>
Cc Jarkko Lavinen <[email protected]>
Cc Venkatraman S <[email protected]>
Cc Viresh Kumar <[email protected]>
Cc Guennadi Liakhovetski <[email protected]>
Cc Ian Molton <[email protected]>
Cc Bruce Chang <[email protected]>
Cc Harald Welte <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc linux-mmc at vger.kernel.org
Cc uclinux-dist-devel at blackfin.uclinux.org
Cc linux-omap at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Cc spear-devel at list.st.com
--- drivers/mmc/host/atmel-mci.c | 2 +- drivers/mmc/host/au1xmmc.c | 2 +- drivers/mmc/host/bfin_sdh.c | 2 +- drivers/mmc/host/cb710-mmc.c | 2 +- drivers/mmc/host/dw_mmc-pci.c | 2 +- drivers/mmc/host/dw_mmc-pltfm.c | 2 +- drivers/mmc/host/jz4740_mmc.c | 8 ++++---- drivers/mmc/host/mmci.c | 6 +++--- drivers/mmc/host/omap.c | 4 ++-- drivers/mmc/host/omap_hsmmc.c | 2 +- drivers/mmc/host/pxamci.c | 4 ++-- drivers/mmc/host/s3cmci.c | 2 +- drivers/mmc/host/sdhci-cns3xxx.c | 2 +- drivers/mmc/host/sdhci-dove.c | 2 +- drivers/mmc/host/sdhci-esdhc-imx.c | 4 ++-- drivers/mmc/host/sdhci-of-esdhc.c | 2 +- drivers/mmc/host/sdhci-of-hlwd.c | 2 +- drivers/mmc/host/sdhci-pci.c | 6 +++--- drivers/mmc/host/sdhci-pxav2.c | 2 +- drivers/mmc/host/sdhci-pxav3.c | 2 +- drivers/mmc/host/sdhci-s3c.c | 6 +++--- drivers/mmc/host/sdhci-spear.c | 8 +++----- drivers/mmc/host/sdhci-tegra.c | 4 ++-- drivers/mmc/host/sh_mmcif.c | 2 +- drivers/mmc/host/sh_mobile_sdhi.c | 2 +- drivers/mmc/host/tmio_mmc.c | 2 +- drivers/mmc/host/tmio_mmc_pio.c | 2 +- drivers/mmc/host/via-sdmmc.c | 2 +- drivers/mmc/host/wbsd.c | 18 +++++++++--------- 29 files changed, 52 insertions(+), 54 deletions(-)
drivers/mmc/host/atmel-mci.c +1 -1
@@ -511,7 +511,7 @@ static const struct of_device_id atmci_dt_ids[] = {MODULE_DEVICE_TABLE (of, atmci_dt_ids); -static struct mci_platform_data __devinit * +static struct mci_platform_data *atmci_of_init (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;
drivers/mmc/host/au1xmmc.c +1 -1
@@ -943,7 +943,7 @@ static const struct mmc_host_ops au1xmmc_ops = { .enable_sdio_irq = au1xmmc_enable_sdio_irq, }; -static int __devinit au1xmmc_probe (struct platform_device *pdev) +static int au1xmmc_probe (struct platform_device *pdev) {struct mmc_host *mmc;struct au1xmmc_host *host;
drivers/mmc/host/bfin_sdh.c +1 -1
@@ -522,7 +522,7 @@ static void sdh_reset(void)SSYNC (); } -static int __devinit sdh_probe (struct platform_device *pdev) +static int sdh_probe (struct platform_device *pdev) {struct mmc_host *mmc;struct sdh_host *host;
drivers/mmc/host/cb710-mmc.c +1 -1
@@ -690,7 +690,7 @@ static int cb710_mmc_resume(struct platform_device *pdev)#endif /* CONFIG_PM */ -static int __devinit cb710_mmc_init (struct platform_device *pdev) +static int cb710_mmc_init (struct platform_device *pdev) {struct cb710_slot *slot =cb710_pdev_to_slot (pdev);struct cb710_chip *chip =cb710_slot_to_chip (slot);
drivers/mmc/host/dw_mmc-pci.c +1 -1
@@ -37,7 +37,7 @@ static struct dw_mci_board pci_board_data = { .fifo_depth = 32, }; -static int __devinit dw_mci_pci_probe (struct pci_dev *pdev, +static int dw_mci_pci_probe (struct pci_dev *pdev,const struct pci_device_id *entries) {struct dw_mci *host;
drivers/mmc/host/dw_mmc-pltfm.c +1 -1
@@ -62,7 +62,7 @@ int dw_mci_pltfm_register(struct platform_device *pdev, }EXPORT_SYMBOL_GPL (dw_mci_pltfm_register); -static int __devinit dw_mci_pltfm_probe (struct platform_device *pdev) +static int dw_mci_pltfm_probe (struct platform_device *pdev) {return dw_mci_pltfm_register (pdev,NULL ); }
drivers/mmc/host/jz4740_mmc.c +4 -4
@@ -702,7 +702,7 @@ static const struct jz_gpio_bulk_request jz4740_mmc_pins[] = { JZ_GPIO_BULK_PIN(MSC_DATA3), }; -static int __devinit jz4740_mmc_request_gpio (struct device *dev,int gpio, +static int jz4740_mmc_request_gpio (struct device *dev,int gpio,const char *name,bool output,int value) {int ret;
@@ -724,7 +724,7 @@ static int __devinit jz4740_mmc_request_gpio(struct device *dev, int gpio,return 0 ; } -static int __devinit jz4740_mmc_request_gpios (struct platform_device *pdev) +static int jz4740_mmc_request_gpios (struct platform_device *pdev) {int ret;struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
@@ -759,7 +759,7 @@ err:return ret; } -static int __devinit jz4740_mmc_request_cd_irq (struct platform_device *pdev, +static int jz4740_mmc_request_cd_irq (struct platform_device *pdev,struct jz4740_mmc_host *host) {struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
@@ -802,7 +802,7 @@ static inline size_t jz4740_mmc_num_pins(struct jz4740_mmc_host *host)return num_pins; } -static int __devinit jz4740_mmc_probe (struct platform_device * pdev) +static int jz4740_mmc_probe (struct platform_device * pdev) {int ret;struct mmc_host *mmc;
drivers/mmc/host/mmci.c +3 -3
@@ -262,7 +262,7 @@ static void mmci_init_sg(struct mmci_host *host, struct mmc_data *data)* no custom DMA interfaces are supported. */ #ifdef CONFIG_DMA_ENGINE -static void __devinit mmci_dma_setup (struct mmci_host *host) +static void mmci_dma_setup (struct mmci_host *host) {struct mmci_platform_data *plat = host->plat;const char *rxname, *txname;
@@ -338,7 +338,7 @@ static void __devinit mmci_dma_setup(struct mmci_host *host) }/* -* This is used in __devinit or __devexit so inline it +* This is used in or __devexit so inline it * so it can be discarded. */ static inline void mmci_dma_release (struct mmci_host *host)
@@ -1262,7 +1262,7 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np, }#endif -static int __devinit mmci_probe (struct amba_device *dev, +static int mmci_probe (struct amba_device *dev,const struct amba_id *id) {struct mmci_platform_data *plat = dev->dev.platform_data;
drivers/mmc/host/omap.c +2 -2
@@ -1230,7 +1230,7 @@ static const struct mmc_host_ops mmc_omap_ops = { .set_ios = mmc_omap_set_ios, }; -static int __devinit mmc_omap_new_slot (struct mmc_omap_host *host,int id) +static int mmc_omap_new_slot (struct mmc_omap_host *host,int id) {struct mmc_omap_slot *slot =NULL ;struct mmc_host *mmc;
@@ -1325,7 +1325,7 @@ static void mmc_omap_remove_slot(struct mmc_omap_slot *slot)mmc_free_host (mmc); } -static int __devinit mmc_omap_probe (struct platform_device *pdev) +static int mmc_omap_probe (struct platform_device *pdev) {struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;struct mmc_omap_host *host =NULL ;
drivers/mmc/host/omap_hsmmc.c +1 -1
@@ -1717,7 +1717,7 @@ static inline struct omap_mmc_platform_data }#endif -static int __devinit omap_hsmmc_probe (struct platform_device *pdev) +static int omap_hsmmc_probe (struct platform_device *pdev) {struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;struct mmc_host *mmc;
drivers/mmc/host/pxamci.c +2 -2
@@ -584,7 +584,7 @@ static const struct of_device_id pxa_mmc_dt_ids[] = {MODULE_DEVICE_TABLE (of, pxa_mmc_dt_ids); -static int __devinit pxamci_of_init (struct platform_device *pdev) +static int pxamci_of_init (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct pxamci_platform_data *pdata;
@@ -614,7 +614,7 @@ static int __devinit pxamci_of_init(struct platform_device *pdev) return 0; }#else -static int __devinit pxamci_of_init (struct platform_device *pdev) +static int pxamci_of_init (struct platform_device *pdev) {return 0 ; }
drivers/mmc/host/s3cmci.c +1 -1
@@ -1540,7 +1540,7 @@ static inline void s3cmci_debugfs_remove(struct s3cmci_host *host) { }#endif /* CONFIG_DEBUG_FS */ -static int __devinit s3cmci_probe (struct platform_device *pdev) +static int s3cmci_probe (struct platform_device *pdev) {struct s3cmci_host *host;struct mmc_host *mmc;
drivers/mmc/host/sdhci-cns3xxx.c +1 -1
@@ -95,7 +95,7 @@ static struct sdhci_pltfm_data sdhci_cns3xxx_pdata = { SDHCI_QUIRK_NONSTANDARD_CLOCK, }; -static int __devinit sdhci_cns3xxx_probe (struct platform_device *pdev) +static int sdhci_cns3xxx_probe (struct platform_device *pdev) {return sdhci_pltfm_register (pdev, &sdhci_cns3xxx_pdata); }
drivers/mmc/host/sdhci-dove.c +1 -1
@@ -78,7 +78,7 @@ static struct sdhci_pltfm_data sdhci_dove_pdata = { SDHCI_QUIRK_NO_HISPD_BIT, }; -static int __devinit sdhci_dove_probe (struct platform_device *pdev) +static int sdhci_dove_probe (struct platform_device *pdev) {struct sdhci_host *host;struct sdhci_pltfm_host *pltfm_host;
drivers/mmc/host/sdhci-esdhc-imx.c +2 -2
@@ -403,7 +403,7 @@ static irqreturn_t cd_irq(int irq, void *data) };#ifdef CONFIG_OF -static int __devinit +static int sdhci_esdhc_imx_probe_dt (struct platform_device *pdev,struct esdhc_platform_data *boarddata) {
@@ -440,7 +440,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, }#endif -static int __devinit sdhci_esdhc_imx_probe (struct platform_device *pdev) +static int sdhci_esdhc_imx_probe (struct platform_device *pdev) {const struct of_device_id *of_id =of_match_device (imx_esdhc_dt_ids, &pdev->dev);
drivers/mmc/host/sdhci-of-esdhc.c +1 -1
@@ -208,7 +208,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata = { .ops = &sdhci_esdhc_ops, }; -static int __devinit sdhci_esdhc_probe (struct platform_device *pdev) +static int sdhci_esdhc_probe (struct platform_device *pdev) {return sdhci_pltfm_register (pdev, &sdhci_esdhc_pdata); }
drivers/mmc/host/sdhci-of-hlwd.c +1 -1
@@ -66,7 +66,7 @@ static struct sdhci_pltfm_data sdhci_hlwd_pdata = { .ops = &sdhci_hlwd_ops, }; -static int __devinit sdhci_hlwd_probe (struct platform_device *pdev) +static int sdhci_hlwd_probe (struct platform_device *pdev) {return sdhci_pltfm_register (pdev, &sdhci_hlwd_pdata); }
drivers/mmc/host/sdhci-pci.c +3 -3
@@ -1183,7 +1183,7 @@ static const struct dev_pm_ops sdhci_pci_pm_ops = {* * \*****************************************************************************/ -static struct sdhci_pci_slot *__devinit sdhci_pci_probe_slot ( +static struct sdhci_pci_slot *sdhci_pci_probe_slot (struct pci_dev *pdev,struct sdhci_pci_chip *chip,int first_bar,int slotno) {
@@ -1338,7 +1338,7 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)sdhci_free_host (slot->host); } -static void __devinit sdhci_pci_runtime_pm_allow (struct device *dev) +static void sdhci_pci_runtime_pm_allow (struct device *dev) {pm_runtime_put_noidle (dev);pm_runtime_allow (dev);
@@ -1353,7 +1353,7 @@ static void __devexit sdhci_pci_runtime_pm_forbid(struct device *dev)pm_runtime_get_noresume (dev); } -static int __devinit sdhci_pci_probe (struct pci_dev *pdev, +static int sdhci_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {struct sdhci_pci_chip *chip;
drivers/mmc/host/sdhci-pxav2.c +1 -1
@@ -166,7 +166,7 @@ static inline struct sdhci_pxa_platdata *pxav2_get_mmc_pdata(struct device *dev) }#endif -static int __devinit sdhci_pxav2_probe (struct platform_device *pdev) +static int sdhci_pxav2_probe (struct platform_device *pdev) {struct sdhci_pltfm_host *pltfm_host;struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;
drivers/mmc/host/sdhci-pxav3.c +1 -1
@@ -214,7 +214,7 @@ static inline struct sdhci_pxa_platdata *pxav3_get_mmc_pdata(struct device *dev) }#endif -static int __devinit sdhci_pxav3_probe (struct platform_device *pdev) +static int sdhci_pxav3_probe (struct platform_device *pdev) {struct sdhci_pltfm_host *pltfm_host;struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;
drivers/mmc/host/sdhci-s3c.c +3 -3
@@ -430,7 +430,7 @@ static void sdhci_s3c_setup_card_detect_gpio(struct sdhci_s3c *sc) }#ifdef CONFIG_OF -static int __devinit sdhci_s3c_parse_dt (struct device *dev, +static int sdhci_s3c_parse_dt (struct device *dev,struct sdhci_host *host,struct s3c_sdhci_platdata *pdata) {struct device_node *node = dev->of_node;
@@ -525,7 +525,7 @@ static int __devinit sdhci_s3c_parse_dt(struct device *dev, return -EINVAL; }#else -static int __devinit sdhci_s3c_parse_dt (struct device *dev, +static int sdhci_s3c_parse_dt (struct device *dev,struct sdhci_host *host,struct s3c_sdhci_platdata *pdata) {return -EINVAL ;
@@ -548,7 +548,7 @@ static inline struct sdhci_s3c_drv_data *sdhci_s3c_get_driver_data(platform_get_device_id (pdev)->driver_data; } -static int __devinit sdhci_s3c_probe (struct platform_device *pdev) +static int sdhci_s3c_probe (struct platform_device *pdev) {struct s3c_sdhci_platdata *pdata;struct sdhci_s3c_drv_data *drv_data;
drivers/mmc/host/sdhci-spear.c +3 -5
@@ -71,8 +71,7 @@ static irqreturn_t sdhci_gpio_irq(int irq, void *dev_id) }#ifdef CONFIG_OF -static struct sdhci_plat_data *__devinit -sdhci_probe_config_dt (struct platform_device *pdev) +static struct sdhci_plat_data *sdhci_probe_config_dt (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct sdhci_plat_data *pdata =NULL ;
@@ -96,14 +95,13 @@ sdhci_probe_config_dt(struct platform_device *pdev) return pdata; }#else -static struct sdhci_plat_data *__devinit -sdhci_probe_config_dt (struct platform_device *pdev) +static struct sdhci_plat_data *sdhci_probe_config_dt (struct platform_device *pdev) {return ERR_PTR (-ENOSYS ); }#endif -static int __devinit sdhci_probe (struct platform_device *pdev) +static int sdhci_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct sdhci_host *host;
drivers/mmc/host/sdhci-tegra.c +2 -2
@@ -217,7 +217,7 @@ static const struct of_device_id sdhci_tegra_dt_match[] __devinitdata = { };MODULE_DEVICE_TABLE (of, sdhci_dt_ids); -static struct tegra_sdhci_platform_data *__devinit sdhci_tegra_dt_parse_pdata ( +static struct tegra_sdhci_platform_data *sdhci_tegra_dt_parse_pdata (struct platform_device *pdev) {struct tegra_sdhci_platform_data *plat;
@@ -244,7 +244,7 @@ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(return plat; } -static int __devinit sdhci_tegra_probe (struct platform_device *pdev) +static int sdhci_tegra_probe (struct platform_device *pdev) {const struct of_device_id *match;const struct sdhci_tegra_soc_data *soc_data;
drivers/mmc/host/sh_mmcif.c +1 -1
@@ -1302,7 +1302,7 @@ static void sh_mmcif_init_ocr(struct sh_mmcif_host *host)dev_warn (mmc_dev (mmc),"Platform OCR mask is ignored\n" ); } -static int __devinit sh_mmcif_probe (struct platform_device *pdev) +static int sh_mmcif_probe (struct platform_device *pdev) {int ret =0 , irq[2 ];struct mmc_host *mmc;
drivers/mmc/host/sh_mobile_sdhi.c +1 -1
@@ -117,7 +117,7 @@ static const struct sh_mobile_sdhi_ops sdhi_ops = { .cd_wakeup = sh_mobile_sdhi_cd_wakeup, }; -static int __devinit sh_mobile_sdhi_probe (struct platform_device *pdev) +static int sh_mobile_sdhi_probe (struct platform_device *pdev) {struct sh_mobile_sdhi *priv;struct tmio_mmc_data *mmc_data;
drivers/mmc/host/tmio_mmc.c +1 -1
@@ -57,7 +57,7 @@ static int tmio_mmc_resume(struct platform_device *dev)#define tmio_mmc_resume NULL#endif -static int __devinit tmio_mmc_probe (struct platform_device *pdev) +static int tmio_mmc_probe (struct platform_device *pdev) {const struct mfd_cell *cell =mfd_get_cell (pdev);struct tmio_mmc_data *pdata;
drivers/mmc/host/tmio_mmc_pio.c +1 -1
@@ -918,7 +918,7 @@ static void tmio_mmc_init_ocr(struct tmio_mmc_host *host)dev_warn (mmc_dev (mmc),"Platform OCR mask is ignored\n" ); } -int __devinit tmio_mmc_host_probe (struct tmio_mmc_host **host, +int tmio_mmc_host_probe (struct tmio_mmc_host **host,struct platform_device *pdev,struct tmio_mmc_data *pdata) {
drivers/mmc/host/via-sdmmc.c +1 -1
@@ -1082,7 +1082,7 @@ static void via_init_mmc_host(struct via_crdr_mmc_host *host)msleep (1 ); } -static int __devinit via_sd_probe (struct pci_dev *pcidev, +static int via_sd_probe (struct pci_dev *pcidev,const struct pci_device_id *id) {struct mmc_host *mmc;
drivers/mmc/host/wbsd.c +9 -9
@@ -1196,7 +1196,7 @@ static irqreturn_t wbsd_irq(int irq, void *dev_id)* Allocate/free MMC structure. */ -static int __devinit wbsd_alloc_mmc (struct device *dev) +static int wbsd_alloc_mmc (struct device *dev) {struct mmc_host *mmc;struct wbsd_host *host;
@@ -1288,7 +1288,7 @@ static void wbsd_free_mmc(struct device *dev)* Scan for known chip id:s */ -static int __devinit wbsd_scan (struct wbsd_host *host) +static int wbsd_scan (struct wbsd_host *host) {int i, j, k;int id;
@@ -1344,7 +1344,7 @@ static int __devinit wbsd_scan(struct wbsd_host *host)* Allocate/free io port ranges */ -static int __devinit wbsd_request_region (struct wbsd_host *host,int base) +static int wbsd_request_region (struct wbsd_host *host,int base) {if (base &0x7 )return -EINVAL ;
@@ -1374,7 +1374,7 @@ static void wbsd_release_regions(struct wbsd_host *host)* Allocate/free DMA port and buffer */ -static void __devinit wbsd_request_dma (struct wbsd_host *host,int dma) +static void wbsd_request_dma (struct wbsd_host *host,int dma) {if (dma <0 )return ;
@@ -1452,7 +1452,7 @@ static void wbsd_release_dma(struct wbsd_host *host)* Allocate/free IRQ. */ -static int __devinit wbsd_request_irq (struct wbsd_host *host,int irq) +static int wbsd_request_irq (struct wbsd_host *host,int irq) {int ret;
@@ -1502,7 +1502,7 @@ static void wbsd_release_irq(struct wbsd_host *host)* Allocate all resources for the host. */ -static int __devinit wbsd_request_resources (struct wbsd_host *host, +static int wbsd_request_resources (struct wbsd_host *host,int base,int irq,int dma) {int ret;
@@ -1644,7 +1644,7 @@ static void wbsd_chip_poweroff(struct wbsd_host *host)* * \*****************************************************************************/ -static int __devinit wbsd_init (struct device *dev,int base,int irq,int dma, +static int wbsd_init (struct device *dev,int base,int irq,int dma,int pnp) {struct wbsd_host *host =NULL ;
@@ -1762,7 +1762,7 @@ static void __devexit wbsd_shutdown(struct device *dev, int pnp)* Non-PnP */ -static int __devinit wbsd_probe (struct platform_device *dev) +static int wbsd_probe (struct platform_device *dev) {/* Use the module parameters for resources */ return wbsd_init (&dev->dev, param_io, param_irq, param_dma,0 );
@@ -1781,7 +1781,7 @@ static int __devexit wbsd_remove(struct platform_device *dev)#ifdef CONFIG_PNP -static int __devinit +static int wbsd_pnp_probe (struct pnp_dev *pnpdev,const struct pnp_device_id *dev_id) {int io, irq, dma;
Signature · 1 line
1.8.0
viresh kumar
maintainerPATCH 237/493 mmc: remove use of __devinit
Quoted 21 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.Signed-off-by Bill Pemberton <[email protected]>Cc Ludovic Desroches <[email protected]>Cc Chris Ball <[email protected]>Cc Manuel Lauss <[email protected]>Cc "Micha? Miros?aw" <[email protected]>Cc Jarkko Lavinen <[email protected]>Cc Venkatraman S <[email protected]>Cc Viresh Kumar <[email protected]>Cc Guennadi Liakhovetski <[email protected]>Cc Ian Molton <[email protected]>Cc Bruce Chang <[email protected]>Cc Harald Welte <[email protected]>Cc Pierre Ossman <[email protected]>Cc linux-mmc at vger.kernel.orgCc uclinux-dist-devel at blackfin.uclinux.orgCc linux-omap at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc spear-devel at list.st.com
Quoted 2 lines
--- drivers/mmc/host/sdhci-spear.c | 8 +++-----
Acked-by Viresh Kumar <[email protected]>
PATCH 237/493 mmc: remove use of __devinit
In reply to Bill PembertonLe 11/19/2012 07:23 PM, Bill Pemberton a ?crit :
Quoted 21 lines
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.Signed-off-by Bill Pemberton <[email protected]>Cc Ludovic Desroches <[email protected]>Cc Chris Ball <[email protected]>Cc Manuel Lauss <[email protected]>Cc "Micha? Miros?aw" <[email protected]>Cc Jarkko Lavinen <[email protected]>Cc Venkatraman S <[email protected]>Cc Viresh Kumar <[email protected]>Cc Guennadi Liakhovetski <[email protected]>Cc Ian Molton <[email protected]>Cc Bruce Chang <[email protected]>Cc Harald Welte <[email protected]>Cc Pierre Ossman <[email protected]>Cc linux-mmc at vger.kernel.orgCc uclinux-dist-devel at blackfin.uclinux.orgCc linux-omap at vger.kernel.orgCc linux-arm-kernel at lists.infradead.orgCc spear-devel at list.st.com
Quoted 2 lines
--- drivers/mmc/host/atmel-mci.c | 2 +-
Quoted 615 lines
drivers/mmc/host/au1xmmc.c | 2 +- drivers/mmc/host/bfin_sdh.c | 2 +- drivers/mmc/host/cb710-mmc.c | 2 +- drivers/mmc/host/dw_mmc-pci.c | 2 +- drivers/mmc/host/dw_mmc-pltfm.c | 2 +- drivers/mmc/host/jz4740_mmc.c | 8 ++++---- drivers/mmc/host/mmci.c | 6 +++--- drivers/mmc/host/omap.c | 4 ++-- drivers/mmc/host/omap_hsmmc.c | 2 +- drivers/mmc/host/pxamci.c | 4 ++-- drivers/mmc/host/s3cmci.c | 2 +- drivers/mmc/host/sdhci-cns3xxx.c | 2 +- drivers/mmc/host/sdhci-dove.c | 2 +- drivers/mmc/host/sdhci-esdhc-imx.c | 4 ++-- drivers/mmc/host/sdhci-of-esdhc.c | 2 +- drivers/mmc/host/sdhci-of-hlwd.c | 2 +- drivers/mmc/host/sdhci-pci.c | 6 +++--- drivers/mmc/host/sdhci-pxav2.c | 2 +- drivers/mmc/host/sdhci-pxav3.c | 2 +- drivers/mmc/host/sdhci-s3c.c | 6 +++--- drivers/mmc/host/sdhci-spear.c | 8 +++----- drivers/mmc/host/sdhci-tegra.c | 4 ++-- drivers/mmc/host/sh_mmcif.c | 2 +- drivers/mmc/host/sh_mobile_sdhi.c | 2 +- drivers/mmc/host/tmio_mmc.c | 2 +- drivers/mmc/host/tmio_mmc_pio.c | 2 +- drivers/mmc/host/via-sdmmc.c | 2 +- drivers/mmc/host/wbsd.c | 18 +++++++++--------- 29 files changed, 52 insertions(+), 54 deletions(-)drivers/mmc/host/atmel-mci.c +1
-1@@ -511,7 +511,7 @@ static const struct of_device_id atmci_dt_ids[] = {MODULE_DEVICE_TABLE (of, atmci_dt_ids); -static struct mci_platform_data __devinit * +static struct mci_platform_data *atmci_of_init (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;drivers/mmc/host/au1xmmc.c +1
-1@@ -943,7 +943,7 @@ static const struct mmc_host_ops au1xmmc_ops = { .enable_sdio_irq = au1xmmc_enable_sdio_irq, }; -static int __devinit au1xmmc_probe (struct platform_device *pdev) +static int au1xmmc_probe (struct platform_device *pdev) {struct mmc_host *mmc;struct au1xmmc_host *host;drivers/mmc/host/bfin_sdh.c +1
-1@@ -522,7 +522,7 @@ static void sdh_reset(void)SSYNC (); } -static int __devinit sdh_probe (struct platform_device *pdev) +static int sdh_probe (struct platform_device *pdev) {struct mmc_host *mmc;struct sdh_host *host;drivers/mmc/host/cb710-mmc.c +1
-1@@ -690,7 +690,7 @@ static int cb710_mmc_resume(struct platform_device *pdev)#endif /* CONFIG_PM */ -static int __devinit cb710_mmc_init (struct platform_device *pdev) +static int cb710_mmc_init (struct platform_device *pdev) {struct cb710_slot *slot =cb710_pdev_to_slot (pdev);struct cb710_chip *chip =cb710_slot_to_chip (slot);drivers/mmc/host/dw_mmc-pci.c +1
-1@@ -37,7 +37,7 @@ static struct dw_mci_board pci_board_data = { .fifo_depth = 32, }; -static int __devinit dw_mci_pci_probe (struct pci_dev *pdev, +static int dw_mci_pci_probe (struct pci_dev *pdev,const struct pci_device_id *entries) {struct dw_mci *host;drivers/mmc/host/dw_mmc-pltfm.c +1
-1@@ -62,7 +62,7 @@ int dw_mci_pltfm_register(struct platform_device *pdev, }EXPORT_SYMBOL_GPL (dw_mci_pltfm_register); -static int __devinit dw_mci_pltfm_probe (struct platform_device *pdev) +static int dw_mci_pltfm_probe (struct platform_device *pdev) {return dw_mci_pltfm_register (pdev,NULL ); }drivers/mmc/host/jz4740_mmc.c +4
-4@@ -702,7 +702,7 @@ static const struct jz_gpio_bulk_request jz4740_mmc_pins[] = { JZ_GPIO_BULK_PIN(MSC_DATA3), }; -static int __devinit jz4740_mmc_request_gpio (struct device *dev,int gpio, +static int jz4740_mmc_request_gpio (struct device *dev,int gpio,const char *name,bool output,int value) {int ret;@@ -724,7 +724,7 @@ static int __devinit jz4740_mmc_request_gpio(struct device *dev, int gpio,return 0 ; } -static int __devinit jz4740_mmc_request_gpios (struct platform_device *pdev) +static int jz4740_mmc_request_gpios (struct platform_device *pdev) {int ret;struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;@@ -759,7 +759,7 @@ err:return ret; } -static int __devinit jz4740_mmc_request_cd_irq (struct platform_device *pdev, +static int jz4740_mmc_request_cd_irq (struct platform_device *pdev,struct jz4740_mmc_host *host) {struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;@@ -802,7 +802,7 @@ static inline size_t jz4740_mmc_num_pins(struct jz4740_mmc_host *host)return num_pins; } -static int __devinit jz4740_mmc_probe (struct platform_device * pdev) +static int jz4740_mmc_probe (struct platform_device * pdev) {int ret;struct mmc_host *mmc;drivers/mmc/host/mmci.c +3
-3@@ -262,7 +262,7 @@ static void mmci_init_sg(struct mmci_host *host, struct mmc_data *data)* no custom DMA interfaces are supported. */ #ifdef CONFIG_DMA_ENGINE -static void __devinit mmci_dma_setup (struct mmci_host *host) +static void mmci_dma_setup (struct mmci_host *host) {struct mmci_platform_data *plat = host->plat;const char *rxname, *txname;@@ -338,7 +338,7 @@ static void __devinit mmci_dma_setup(struct mmci_host *host) }/* -* This is used in __devinit or __devexit so inline it +* This is used in or __devexit so inline it * so it can be discarded. */ static inline void mmci_dma_release (struct mmci_host *host)@@ -1262,7 +1262,7 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np, }#endif -static int __devinit mmci_probe (struct amba_device *dev, +static int mmci_probe (struct amba_device *dev,const struct amba_id *id) {struct mmci_platform_data *plat = dev->dev.platform_data;drivers/mmc/host/omap.c +2
-2@@ -1230,7 +1230,7 @@ static const struct mmc_host_ops mmc_omap_ops = { .set_ios = mmc_omap_set_ios, }; -static int __devinit mmc_omap_new_slot (struct mmc_omap_host *host,int id) +static int mmc_omap_new_slot (struct mmc_omap_host *host,int id) {struct mmc_omap_slot *slot =NULL ;struct mmc_host *mmc;@@ -1325,7 +1325,7 @@ static void mmc_omap_remove_slot(struct mmc_omap_slot *slot)mmc_free_host (mmc); } -static int __devinit mmc_omap_probe (struct platform_device *pdev) +static int mmc_omap_probe (struct platform_device *pdev) {struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;struct mmc_omap_host *host =NULL ;drivers/mmc/host/omap_hsmmc.c +1
-1@@ -1717,7 +1717,7 @@ static inline struct omap_mmc_platform_data }#endif -static int __devinit omap_hsmmc_probe (struct platform_device *pdev) +static int omap_hsmmc_probe (struct platform_device *pdev) {struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;struct mmc_host *mmc;drivers/mmc/host/pxamci.c +2
-2@@ -584,7 +584,7 @@ static const struct of_device_id pxa_mmc_dt_ids[] = {MODULE_DEVICE_TABLE (of, pxa_mmc_dt_ids); -static int __devinit pxamci_of_init (struct platform_device *pdev) +static int pxamci_of_init (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct pxamci_platform_data *pdata;@@ -614,7 +614,7 @@ static int __devinit pxamci_of_init(struct platform_device *pdev) return 0; }#else -static int __devinit pxamci_of_init (struct platform_device *pdev) +static int pxamci_of_init (struct platform_device *pdev) {return 0 ; }drivers/mmc/host/s3cmci.c +1
-1@@ -1540,7 +1540,7 @@ static inline void s3cmci_debugfs_remove(struct s3cmci_host *host) { }#endif /* CONFIG_DEBUG_FS */ -static int __devinit s3cmci_probe (struct platform_device *pdev) +static int s3cmci_probe (struct platform_device *pdev) {struct s3cmci_host *host;struct mmc_host *mmc;drivers/mmc/host/sdhci-cns3xxx.c +1
-1@@ -95,7 +95,7 @@ static struct sdhci_pltfm_data sdhci_cns3xxx_pdata = { SDHCI_QUIRK_NONSTANDARD_CLOCK, }; -static int __devinit sdhci_cns3xxx_probe (struct platform_device *pdev) +static int sdhci_cns3xxx_probe (struct platform_device *pdev) {return sdhci_pltfm_register (pdev, &sdhci_cns3xxx_pdata); }drivers/mmc/host/sdhci-dove.c +1
-1@@ -78,7 +78,7 @@ static struct sdhci_pltfm_data sdhci_dove_pdata = { SDHCI_QUIRK_NO_HISPD_BIT, }; -static int __devinit sdhci_dove_probe (struct platform_device *pdev) +static int sdhci_dove_probe (struct platform_device *pdev) {struct sdhci_host *host;struct sdhci_pltfm_host *pltfm_host;drivers/mmc/host/sdhci-esdhc-imx.c +2
-2@@ -403,7 +403,7 @@ static irqreturn_t cd_irq(int irq, void *data) };#ifdef CONFIG_OF -static int __devinit +static int sdhci_esdhc_imx_probe_dt (struct platform_device *pdev,struct esdhc_platform_data *boarddata) {@@ -440,7 +440,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, }#endif -static int __devinit sdhci_esdhc_imx_probe (struct platform_device *pdev) +static int sdhci_esdhc_imx_probe (struct platform_device *pdev) {const struct of_device_id *of_id =of_match_device (imx_esdhc_dt_ids, &pdev->dev);drivers/mmc/host/sdhci-of-esdhc.c +1
-1@@ -208,7 +208,7 @@ static struct sdhci_pltfm_data sdhci_esdhc_pdata = { .ops = &sdhci_esdhc_ops, }; -static int __devinit sdhci_esdhc_probe (struct platform_device *pdev) +static int sdhci_esdhc_probe (struct platform_device *pdev) {return sdhci_pltfm_register (pdev, &sdhci_esdhc_pdata); }drivers/mmc/host/sdhci-of-hlwd.c +1
-1@@ -66,7 +66,7 @@ static struct sdhci_pltfm_data sdhci_hlwd_pdata = { .ops = &sdhci_hlwd_ops, }; -static int __devinit sdhci_hlwd_probe (struct platform_device *pdev) +static int sdhci_hlwd_probe (struct platform_device *pdev) {return sdhci_pltfm_register (pdev, &sdhci_hlwd_pdata); }drivers/mmc/host/sdhci-pci.c +3
-3@@ -1183,7 +1183,7 @@ static const struct dev_pm_ops sdhci_pci_pm_ops = {* * \*****************************************************************************/ -static struct sdhci_pci_slot *__devinit sdhci_pci_probe_slot ( +static struct sdhci_pci_slot *sdhci_pci_probe_slot (struct pci_dev *pdev,struct sdhci_pci_chip *chip,int first_bar,int slotno) {@@ -1338,7 +1338,7 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)sdhci_free_host (slot->host); } -static void __devinit sdhci_pci_runtime_pm_allow (struct device *dev) +static void sdhci_pci_runtime_pm_allow (struct device *dev) {pm_runtime_put_noidle (dev);pm_runtime_allow (dev);@@ -1353,7 +1353,7 @@ static void __devexit sdhci_pci_runtime_pm_forbid(struct device *dev)pm_runtime_get_noresume (dev); } -static int __devinit sdhci_pci_probe (struct pci_dev *pdev, +static int sdhci_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {struct sdhci_pci_chip *chip;drivers/mmc/host/sdhci-pxav2.c +1
-1@@ -166,7 +166,7 @@ static inline struct sdhci_pxa_platdata *pxav2_get_mmc_pdata(struct device *dev) }#endif -static int __devinit sdhci_pxav2_probe (struct platform_device *pdev) +static int sdhci_pxav2_probe (struct platform_device *pdev) {struct sdhci_pltfm_host *pltfm_host;struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;drivers/mmc/host/sdhci-pxav3.c +1
-1@@ -214,7 +214,7 @@ static inline struct sdhci_pxa_platdata *pxav3_get_mmc_pdata(struct device *dev) }#endif -static int __devinit sdhci_pxav3_probe (struct platform_device *pdev) +static int sdhci_pxav3_probe (struct platform_device *pdev) {struct sdhci_pltfm_host *pltfm_host;struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;drivers/mmc/host/sdhci-s3c.c +3
-3@@ -430,7 +430,7 @@ static void sdhci_s3c_setup_card_detect_gpio(struct sdhci_s3c *sc) }#ifdef CONFIG_OF -static int __devinit sdhci_s3c_parse_dt (struct device *dev, +static int sdhci_s3c_parse_dt (struct device *dev,struct sdhci_host *host,struct s3c_sdhci_platdata *pdata) {struct device_node *node = dev->of_node;@@ -525,7 +525,7 @@ static int __devinit sdhci_s3c_parse_dt(struct device *dev, return -EINVAL; }#else -static int __devinit sdhci_s3c_parse_dt (struct device *dev, +static int sdhci_s3c_parse_dt (struct device *dev,struct sdhci_host *host,struct s3c_sdhci_platdata *pdata) {return -EINVAL ;@@ -548,7 +548,7 @@ static inline struct sdhci_s3c_drv_data *sdhci_s3c_get_driver_data(platform_get_device_id (pdev)->driver_data; } -static int __devinit sdhci_s3c_probe (struct platform_device *pdev) +static int sdhci_s3c_probe (struct platform_device *pdev) {struct s3c_sdhci_platdata *pdata;struct sdhci_s3c_drv_data *drv_data;drivers/mmc/host/sdhci-spear.c +3
-5@@ -71,8 +71,7 @@ static irqreturn_t sdhci_gpio_irq(int irq, void *dev_id) }#ifdef CONFIG_OF -static struct sdhci_plat_data *__devinit -sdhci_probe_config_dt (struct platform_device *pdev) +static struct sdhci_plat_data *sdhci_probe_config_dt (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct sdhci_plat_data *pdata =NULL ;@@ -96,14 +95,13 @@ sdhci_probe_config_dt(struct platform_device *pdev) return pdata; }#else -static struct sdhci_plat_data *__devinit -sdhci_probe_config_dt (struct platform_device *pdev) +static struct sdhci_plat_data *sdhci_probe_config_dt (struct platform_device *pdev) {return ERR_PTR (-ENOSYS ); }#endif -static int __devinit sdhci_probe (struct platform_device *pdev) +static int sdhci_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct sdhci_host *host;drivers/mmc/host/sdhci-tegra.c +2
-2@@ -217,7 +217,7 @@ static const struct of_device_id sdhci_tegra_dt_match[] __devinitdata = { };MODULE_DEVICE_TABLE (of, sdhci_dt_ids); -static struct tegra_sdhci_platform_data *__devinit sdhci_tegra_dt_parse_pdata ( +static struct tegra_sdhci_platform_data *sdhci_tegra_dt_parse_pdata (struct platform_device *pdev) {struct tegra_sdhci_platform_data *plat;@@ -244,7 +244,7 @@ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(return plat; } -static int __devinit sdhci_tegra_probe (struct platform_device *pdev) +static int sdhci_tegra_probe (struct platform_device *pdev) {const struct of_device_id *match;const struct sdhci_tegra_soc_data *soc_data;drivers/mmc/host/sh_mmcif.c +1
-1@@ -1302,7 +1302,7 @@ static void sh_mmcif_init_ocr(struct sh_mmcif_host *host)dev_warn (mmc_dev (mmc),"Platform OCR mask is ignored\n" ); } -static int __devinit sh_mmcif_probe (struct platform_device *pdev) +static int sh_mmcif_probe (struct platform_device *pdev) {int ret =0 , irq[2 ];struct mmc_host *mmc;drivers/mmc/host/sh_mobile_sdhi.c +1
-1@@ -117,7 +117,7 @@ static const struct sh_mobile_sdhi_ops sdhi_ops = { .cd_wakeup = sh_mobile_sdhi_cd_wakeup, }; -static int __devinit sh_mobile_sdhi_probe (struct platform_device *pdev) +static int sh_mobile_sdhi_probe (struct platform_device *pdev) {struct sh_mobile_sdhi *priv;struct tmio_mmc_data *mmc_data;drivers/mmc/host/tmio_mmc.c +1
-1@@ -57,7 +57,7 @@ static int tmio_mmc_resume(struct platform_device *dev)#define tmio_mmc_resume NULL#endif -static int __devinit tmio_mmc_probe (struct platform_device *pdev) +static int tmio_mmc_probe (struct platform_device *pdev) {const struct mfd_cell *cell =mfd_get_cell (pdev);struct tmio_mmc_data *pdata;drivers/mmc/host/tmio_mmc_pio.c +1
-1@@ -918,7 +918,7 @@ static void tmio_mmc_init_ocr(struct tmio_mmc_host *host)dev_warn (mmc_dev (mmc),"Platform OCR mask is ignored\n" ); } -int __devinit tmio_mmc_host_probe (struct tmio_mmc_host **host, +int tmio_mmc_host_probe (struct tmio_mmc_host **host,struct platform_device *pdev,struct tmio_mmc_data *pdata) {drivers/mmc/host/via-sdmmc.c +1
-1@@ -1082,7 +1082,7 @@ static void via_init_mmc_host(struct via_crdr_mmc_host *host)msleep (1 ); } -static int __devinit via_sd_probe (struct pci_dev *pcidev, +static int via_sd_probe (struct pci_dev *pcidev,const struct pci_device_id *id) {struct mmc_host *mmc;drivers/mmc/host/wbsd.c +9
-9@@ -1196,7 +1196,7 @@ static irqreturn_t wbsd_irq(int irq, void *dev_id)* Allocate/free MMC structure. */ -static int __devinit wbsd_alloc_mmc (struct device *dev) +static int wbsd_alloc_mmc (struct device *dev) {struct mmc_host *mmc;struct wbsd_host *host;@@ -1288,7 +1288,7 @@ static void wbsd_free_mmc(struct device *dev)* Scan for known chip id:s */ -static int __devinit wbsd_scan (struct wbsd_host *host) +static int wbsd_scan (struct wbsd_host *host) {int i, j, k;int id;@@ -1344,7 +1344,7 @@ static int __devinit wbsd_scan(struct wbsd_host *host)* Allocate/free io port ranges */ -static int __devinit wbsd_request_region (struct wbsd_host *host,int base) +static int wbsd_request_region (struct wbsd_host *host,int base) {if (base &0x7 )return -EINVAL ;@@ -1374,7 +1374,7 @@ static void wbsd_release_regions(struct wbsd_host *host)* Allocate/free DMA port and buffer */ -static void __devinit wbsd_request_dma (struct wbsd_host *host,int dma) +static void wbsd_request_dma (struct wbsd_host *host,int dma) {if (dma <0 )return ;@@ -1452,7 +1452,7 @@ static void wbsd_release_dma(struct wbsd_host *host)* Allocate/free IRQ. */ -static int __devinit wbsd_request_irq (struct wbsd_host *host,int irq) +static int wbsd_request_irq (struct wbsd_host *host,int irq) {int ret;@@ -1502,7 +1502,7 @@ static void wbsd_release_irq(struct wbsd_host *host)* Allocate all resources for the host. */ -static int __devinit wbsd_request_resources (struct wbsd_host *host, +static int wbsd_request_resources (struct wbsd_host *host,int base,int irq,int dma) {int ret;@@ -1644,7 +1644,7 @@ static void wbsd_chip_poweroff(struct wbsd_host *host)* * \*****************************************************************************/ -static int __devinit wbsd_init (struct device *dev,int base,int irq,int dma, +static int wbsd_init (struct device *dev,int base,int irq,int dma,int pnp) {struct wbsd_host *host =NULL ;@@ -1762,7 +1762,7 @@ static void __devexit wbsd_shutdown(struct device *dev, int pnp)* Non-PnP */ -static int __devinit wbsd_probe (struct platform_device *dev) +static int wbsd_probe (struct platform_device *dev) {/* Use the module parameters for resources */ return wbsd_init (&dev->dev, param_io, param_irq, param_dma,0 );@@ -1781,7 +1781,7 @@ static int __devexit wbsd_remove(struct platform_device *dev)#ifdef CONFIG_PNP -static int __devinit +static int wbsd_pnp_probe (struct pnp_dev *pnpdev,const struct pnp_device_id *dev_id) {int io, irq, dma;
PATCH 237/493 mmc: remove use of __devinit
In reply to Bill PembertonQuoted 4 lines · Bill Pemberton
drivers/mmc/host/sh_mmcif.c | 2 +- drivers/mmc/host/sh_mobile_sdhi.c | 2 +- drivers/mmc/host/tmio_mmc.c | 2 +- drivers/mmc/host/tmio_mmc_pio.c | 2 +-
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
PATCH 238/493 mtd: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Wan ZongShun <[email protected]>
Cc Olof Johansson <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc linux-mtd at lists.infradead.org
Cc linux-arm-kernel at lists.infradead.org
Cc linuxppc-dev at lists.ozlabs.org
--- drivers/mtd/devices/m25p80.c | 4 ++-- drivers/mtd/devices/mtd_dataflash.c | 8 ++++---- drivers/mtd/devices/spear_smi.c | 6 +++--- drivers/mtd/devices/sst25l.c | 4 ++-- drivers/mtd/maps/amd76xrom.c | 2 +- drivers/mtd/maps/autcpu12-nvram.c | 2 +- drivers/mtd/maps/bfin-async-flash.c | 2 +- drivers/mtd/maps/ck804xrom.c | 2 +- drivers/mtd/maps/esb2rom.c | 2 +- drivers/mtd/maps/gpio-addr-flash.c | 2 +- drivers/mtd/maps/ichxrom.c | 2 +- drivers/mtd/maps/intel_vr_nor.c | 8 ++++---- drivers/mtd/maps/lantiq-flash.c | 2 +- drivers/mtd/maps/latch-addr-flash.c | 2 +- drivers/mtd/maps/pci.c | 2 +- drivers/mtd/maps/physmap_of.c | 8 ++++---- drivers/mtd/maps/pismo.c | 14 +++++++------- drivers/mtd/maps/pxa2xx-flash.c | 2 +- drivers/mtd/maps/sa1100-flash.c | 5 ++--- drivers/mtd/maps/scb2_flash.c | 4 ++-- drivers/mtd/maps/sun_uflash.c | 2 +- drivers/mtd/maps/vmu-flash.c | 4 ++-- drivers/mtd/nand/ams-delta.c | 2 +- drivers/mtd/nand/atmel_nand.c | 12 ++++++------ drivers/mtd/nand/au1550nd.c | 4 ++-- drivers/mtd/nand/bf5xx_nand.c | 4 ++-- drivers/mtd/nand/cafe_nand.c | 8 ++++---- drivers/mtd/nand/denali_dt.c | 2 +- drivers/mtd/nand/denali_pci.c | 2 +- drivers/mtd/nand/fsl_elbc_nand.c | 2 +- drivers/mtd/nand/fsl_ifc_nand.c | 2 +- drivers/mtd/nand/fsl_upm.c | 4 ++-- drivers/mtd/nand/fsmc_nand.c | 4 ++-- drivers/mtd/nand/gpio.c | 2 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 16 ++++++++-------- drivers/mtd/nand/jz4740_nand.c | 4 ++-- drivers/mtd/nand/lpc32xx_mlc.c | 2 +- drivers/mtd/nand/lpc32xx_slc.c | 2 +- drivers/mtd/nand/mpc5121_nfc.c | 2 +- drivers/mtd/nand/mxc_nand.c | 2 +- drivers/mtd/nand/ndfc.c | 2 +- drivers/mtd/nand/nuc900_nand.c | 2 +- drivers/mtd/nand/omap2.c | 2 +- drivers/mtd/nand/pasemi_nand.c | 2 +- drivers/mtd/nand/plat_nand.c | 2 +- drivers/mtd/nand/sh_flctl.c | 2 +- drivers/mtd/nand/sharpsl.c | 2 +- drivers/mtd/nand/socrates_nand.c | 2 +- drivers/mtd/onenand/generic.c | 2 +- drivers/mtd/onenand/omap2.c | 2 +- 50 files changed, 92 insertions(+), 93 deletions(-)
drivers/mtd/devices/m25p80.c +2 -2
@@ -754,7 +754,7 @@ static const struct spi_device_id m25p_ids[] = { };MODULE_DEVICE_TABLE (spi, m25p_ids); -static const struct spi_device_id *__devinit jedec_probe (struct spi_device *spi) +static const struct spi_device_id *jedec_probe (struct spi_device *spi) {int tmp;u8 code =OPCODE_RDID ;
@@ -799,7 +799,7 @@ static const struct spi_device_id *__devinit jedec_probe(struct spi_device *spi)* matches what the READ command supports, at least until this driver * understands FAST_READ (for clocks over 25 MHz). */ -static int __devinit m25p_probe (struct spi_device *spi) +static int m25p_probe (struct spi_device *spi) {const struct spi_device_id *id =spi_get_device_id (spi);struct flash_platform_data *data;
drivers/mtd/devices/mtd_dataflash.c +4 -4
@@ -618,7 +618,7 @@ static char *otp_setup(struct mtd_info *device, char revision)/* * Register DataFlash device with MTD subsystem. */ -static int __devinit +static int add_dataflash_otp (struct spi_device *spi,char *name,int nr_pages,int pagesize,int pageoffset,char revision) {
@@ -679,7 +679,7 @@ add_dataflash_otp(struct spi_device *spi, char *name,return err; } -static inline int __devinit +static inline int add_dataflash (struct spi_device *spi,char *name,int nr_pages,int pagesize,int pageoffset) {
@@ -740,7 +740,7 @@ static struct flash_info __devinitdata dataflash_data [] = { { "at45db642d", 0x1f2800, 8192, 1024, 10, SUP_POW2PS | IS_POW2PS}, }; -static struct flash_info *__devinit jedec_probe (struct spi_device *spi) +static struct flash_info *jedec_probe (struct spi_device *spi) {int tmp;uint8_t code =OP_READ_ID ;
@@ -823,7 +823,7 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)* AT45DB0642 64Mbit (8M) xx111xxx (0x3c) 8192 1056 11 * AT45DB1282 128Mbit (16M) xx0100xx (0x10) 16384 1056 11 */ -static int __devinit dataflash_probe (struct spi_device *spi) +static int dataflash_probe (struct spi_device *spi) {int status;struct flash_info *info;
drivers/mtd/devices/spear_smi.c +3 -3
@@ -756,7 +756,7 @@ err_probe:#ifdef CONFIG_OF -static int __devinit spear_smi_probe_config_dt (struct platform_device *pdev, +static int spear_smi_probe_config_dt (struct platform_device *pdev,struct device_node *np) {struct spear_smi_plat_data *pdata =dev_get_platdata (&pdev->dev);
@@ -799,7 +799,7 @@ static int __devinit spear_smi_probe_config_dt(struct platform_device *pdev, return 0; }#else -static int __devinit spear_smi_probe_config_dt (struct platform_device *pdev, +static int spear_smi_probe_config_dt (struct platform_device *pdev,struct device_node *np) {return -ENOSYS ;
@@ -901,7 +901,7 @@ static int spear_smi_setup_banks(struct platform_device *pdev,* and do proper init for any found one. * Returns 0 on success, non zero otherwise */ -static int __devinit spear_smi_probe (struct platform_device *pdev) +static int spear_smi_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct spear_smi_plat_data *pdata =NULL ;
drivers/mtd/devices/sst25l.c +2 -2
@@ -313,7 +313,7 @@ out:return ret; } -static struct flash_info *__devinit sst25l_match_device (struct spi_device *spi) +static struct flash_info *sst25l_match_device (struct spi_device *spi) {struct flash_info *flash_info =NULL ;struct spi_message m;
@@ -353,7 +353,7 @@ static struct flash_info *__devinit sst25l_match_device(struct spi_device *spi)return flash_info; } -static int __devinit sst25l_probe (struct spi_device *spi) +static int sst25l_probe (struct spi_device *spi) {struct flash_info *flash_info;struct sst25l_flash *flash;
drivers/mtd/maps/amd76xrom.c +1 -1
@@ -100,7 +100,7 @@ static void amd76xrom_cleanup(struct amd76xrom_window *window) } -static int __devinit amd76xrom_init_one (struct pci_dev *pdev, +static int amd76xrom_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {static char *rom_probe_types[] = {"cfi_probe" ,"jedec_probe" ,NULL };
drivers/mtd/maps/autcpu12-nvram.c +1 -1
@@ -33,7 +33,7 @@ struct autcpu12_nvram_priv {struct map_info map; }; -static int __devinit autcpu12_nvram_probe (struct platform_device *pdev) +static int autcpu12_nvram_probe (struct platform_device *pdev) {map_word tmp, save0, save1;struct resource *res;
drivers/mtd/maps/bfin-async-flash.c +1 -1
@@ -123,7 +123,7 @@ static void bfin_flash_copy_to(struct map_info *map, unsigned long to, const voistatic const char *part_probe_types[] = {"cmdlinepart" ,"RedBoot" ,NULL }; -static int __devinit bfin_flash_probe (struct platform_device *pdev) +static int bfin_flash_probe (struct platform_device *pdev) {int ret;struct physmap_flash_data *pdata = pdev->dev.platform_data;
drivers/mtd/maps/ck804xrom.c +1 -1
@@ -112,7 +112,7 @@ static void ck804xrom_cleanup(struct ck804xrom_window *window) } -static int __devinit ck804xrom_init_one (struct pci_dev *pdev, +static int ck804xrom_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {static char *rom_probe_types[] = {"cfi_probe" ,"jedec_probe" ,NULL };
drivers/mtd/maps/esb2rom.c +1 -1
@@ -144,7 +144,7 @@ static void esb2rom_cleanup(struct esb2rom_window *window)pci_dev_put (window->pdev); } -static int __devinit esb2rom_init_one (struct pci_dev *pdev, +static int esb2rom_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {static char *rom_probe_types[] = {"cfi_probe" ,"jedec_probe" ,NULL };
drivers/mtd/maps/gpio-addr-flash.c +1 -1
@@ -185,7 +185,7 @@ static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };* ... * }; */ -static int __devinit gpio_flash_probe (struct platform_device *pdev) +static int gpio_flash_probe (struct platform_device *pdev) {size_t i, arr_size;struct physmap_flash_data *pdata;
drivers/mtd/maps/ichxrom.c +1 -1
@@ -84,7 +84,7 @@ static void ichxrom_cleanup(struct ichxrom_window *window) } -static int __devinit ichxrom_init_one (struct pci_dev *pdev, +static int ichxrom_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {static char *rom_probe_types[] = {"cfi_probe" ,"jedec_probe" ,NULL };
drivers/mtd/maps/intel_vr_nor.c +4 -4
@@ -68,7 +68,7 @@ static void __devexit vr_nor_destroy_partitions(struct vr_nor_mtd *p)mtd_device_unregister (p->info); } -static int __devinit vr_nor_init_partitions (struct vr_nor_mtd *p) +static int vr_nor_init_partitions (struct vr_nor_mtd *p) {/* register the flash bank */ /* partition the flash bank */
@@ -80,7 +80,7 @@ static void __devexit vr_nor_destroy_mtd_setup(struct vr_nor_mtd *p)map_destroy (p->info); } -static int __devinit vr_nor_mtd_setup (struct vr_nor_mtd *p) +static int vr_nor_mtd_setup (struct vr_nor_mtd *p) {static const char *probe_types[] = {"cfi_probe" ,"jedec_probe" ,NULL };
@@ -116,7 +116,7 @@ static void __devexit vr_nor_destroy_maps(struct vr_nor_mtd *p)* Initialize the map_info structure and map the flash. * Returns 0 on success, nonzero otherwise. */ -static int __devinit vr_nor_init_maps (struct vr_nor_mtd *p) +static int vr_nor_init_maps (struct vr_nor_mtd *p) {unsigned long csr_phys, csr_len;unsigned long win_phys, win_len;
@@ -189,7 +189,7 @@ static void __devexit vr_nor_pci_remove(struct pci_dev *dev)pci_disable_device (dev); } -static int __devinit +static int vr_nor_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) {struct vr_nor_mtd *p =NULL ;
drivers/mtd/maps/lantiq-flash.c +1 -1
@@ -109,7 +109,7 @@ ltq_copy_to(struct map_info *map, unsigned long to,spin_unlock_irqrestore (&ebu_lock, flags); } -static int __devinit +static int ltq_mtd_probe (struct platform_device *pdev) {struct mtd_part_parser_data ppdata;
drivers/mtd/maps/latch-addr-flash.c +1 -1
@@ -125,7 +125,7 @@ static int latch_addr_flash_remove(struct platform_device *dev)return 0 ; } -static int __devinit latch_addr_flash_probe (struct platform_device *dev) +static int latch_addr_flash_probe (struct platform_device *dev) {struct latch_addr_flash_data *latch_addr_data;struct latch_addr_flash_info *info;
drivers/mtd/maps/pci.c +1 -1
@@ -253,7 +253,7 @@ static struct pci_device_id mtd_pci_ids[] = {* Generic code follows. */ -static int __devinit +static int mtd_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) {struct mtd_pci_info *info = (struct mtd_pci_info *)id->driver_data;
drivers/mtd/maps/physmap_of.c +4 -4
@@ -77,7 +77,7 @@ static int of_flash_remove(struct platform_device *dev)/* Helper function to handle probing of the obsolete "direct-mapped" * compatible binding, which has an extra "probe-type" property * describing the type of flash probe necessary. */ -static struct mtd_info *__devinit obsolete_probe (struct platform_device *dev, +static struct mtd_info *obsolete_probe (struct platform_device *dev,struct map_info *map) {struct device_node *dp = dev->dev.of_node;
@@ -116,7 +116,7 @@ static struct mtd_info * __devinit obsolete_probe(struct platform_device *dev,information. */ static const char *part_probe_types_def[] = {"cmdlinepart" ,"RedBoot" ,"ofpart" ,"ofoldpart" ,NULL }; -static const char **__devinit of_get_probes (struct device_node *dp) +static const char **of_get_probes (struct device_node *dp) {const char *cp;int cplen;
@@ -145,14 +145,14 @@ static const char ** __devinit of_get_probes(struct device_node *dp)return res; } -static void __devinit of_free_probes (const char **probes) +static void of_free_probes (const char **probes) {if (probes != part_probe_types_def)kfree (probes); }static struct of_device_id of_flash_match[]; -static int __devinit of_flash_probe (struct platform_device *dev) +static int of_flash_probe (struct platform_device *dev) {const char **part_probe_types;const struct of_device_id *match;
drivers/mtd/maps/pismo.c +7 -7
@@ -58,7 +58,7 @@ static void pismo_set_vpp(struct platform_device *pdev, int on) pismo->vpp (pismo->vpp_data, on); } -static unsigned int __devinit pismo_width_to_bytes (unsigned int width) +static unsigned int pismo_width_to_bytes (unsigned int width) { width &=15 ;if (width >2 )
@@ -66,7 +66,7 @@ static unsigned int __devinit pismo_width_to_bytes(unsigned int width)return 1 << width; } -static int __devinit pismo_eeprom_read (struct i2c_client *client,void *buf, +static int pismo_eeprom_read (struct i2c_client *client,void *buf,u8 addr,size_t size) {int ret;
@@ -88,7 +88,7 @@ static int __devinit pismo_eeprom_read(struct i2c_client *client, void *buf,return ret ==ARRAY_SIZE (msg) ? size : -EIO ; } -static int __devinit pismo_add_device (struct pismo_data *pismo,int i, +static int pismo_add_device (struct pismo_data *pismo,int i,struct pismo_mem *region,const char *name,void *pdata,size_t psize) {struct platform_device *dev;
@@ -129,7 +129,7 @@ static int __devinit pismo_add_device(struct pismo_data *pismo, int i,return ret; } -static int __devinit pismo_add_nor (struct pismo_data *pismo,int i, +static int pismo_add_nor (struct pismo_data *pismo,int i,struct pismo_mem *region) {struct physmap_flash_data data = {
@@ -143,7 +143,7 @@ static int __devinit pismo_add_nor(struct pismo_data *pismo, int i, &data, sizeof(data)); } -static int __devinit pismo_add_sram (struct pismo_data *pismo,int i, +static int pismo_add_sram (struct pismo_data *pismo,int i,struct pismo_mem *region) {struct platdata_mtd_ram data = {
@@ -154,7 +154,7 @@ static int __devinit pismo_add_sram(struct pismo_data *pismo, int i, &data, sizeof(data)); } -static void __devinit pismo_add_one (struct pismo_data *pismo,int i, +static void pismo_add_one (struct pismo_data *pismo,int i,const struct pismo_cs_block *cs,phys_addr_t base) {struct device *dev = &pismo->client->dev;
@@ -210,7 +210,7 @@ static int __devexit pismo_remove(struct i2c_client *client)return 0 ; } -static int __devinit pismo_probe (struct i2c_client *client, +static int pismo_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct i2c_adapter *adapter =to_i2c_adapter (client->dev.parent);
drivers/mtd/maps/pxa2xx-flash.c +1 -1
@@ -49,7 +49,7 @@ struct pxa2xx_flash_info {static const char *probes[] = {"RedBoot" ,"cmdlinepart" ,NULL }; -static int __devinit pxa2xx_flash_probe (struct platform_device *pdev) +static int pxa2xx_flash_probe (struct platform_device *pdev) {struct flash_platform_data *flash = pdev->dev.platform_data;struct pxa2xx_flash_info *info;
drivers/mtd/maps/sa1100-flash.c +2 -3
@@ -149,8 +149,7 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla plat->exit (); } -static struct sa_info *__devinit -sa1100_setup_mtd (struct platform_device *pdev,struct flash_platform_data *plat) +static struct sa_info *sa1100_setup_mtd (struct platform_device *pdev,struct flash_platform_data *plat) {struct sa_info *info;int nr, size, i, ret =0 ;
@@ -246,7 +245,7 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)static const char *part_probes[] = {"cmdlinepart" ,"RedBoot" ,NULL }; -static int __devinit sa1100_mtd_probe (struct platform_device *pdev) +static int sa1100_mtd_probe (struct platform_device *pdev) {struct flash_platform_data *plat = pdev->dev.platform_data;struct sa_info *info;
drivers/mtd/maps/scb2_flash.c +2 -2
@@ -69,7 +69,7 @@ static struct map_info scb2_map = { };static int region_fail; -static int __devinit +static int scb2_fixup_mtd (struct mtd_info *mtd) {int i;
@@ -133,7 +133,7 @@ scb2_fixup_mtd(struct mtd_info *mtd)/* CSB5's 'Function Control Register' has bits for decoding @ >= 0xffc00000 */ #define CSB5_FCR 0x41#define CSB5_FCR_DECODE_ALL 0x0e -static int __devinit +static int scb2_flash_probe (struct pci_dev *dev,const struct pci_device_id *ent) {u8 reg;
drivers/mtd/maps/sun_uflash.c +1 -1
@@ -108,7 +108,7 @@ int uflash_devinit(struct platform_device *op, struct device_node *dp)return 0 ; } -static int __devinit uflash_probe (struct platform_device *op) +static int uflash_probe (struct platform_device *op) {struct device_node *dp = op->dev.of_node;
drivers/mtd/maps/vmu-flash.c +2 -2
@@ -596,7 +596,7 @@ fail_name: }/* Handles very basic info about the flash, queries for details */ -static int __devinit vmu_connect (struct maple_device *mdev) +static int vmu_connect (struct maple_device *mdev) {unsigned long test_flash_data, basic_flash_data;int c, error;
@@ -772,7 +772,7 @@ static void vmu_file_error(struct maple_device *mdev, void *recvbuf) } -static int __devinit probe_maple_vmu (struct device *dev) +static int probe_maple_vmu (struct device *dev) {int error;struct maple_device *mdev =to_maple_dev (dev);
drivers/mtd/nand/ams-delta.c +1 -1
@@ -173,7 +173,7 @@ static const struct gpio _mandatory_gpio[] = {/* * Main initialization routine */ -static int __devinit ams_delta_init (struct platform_device *pdev) +static int ams_delta_init (struct platform_device *pdev) {struct nand_chip *this;struct resource *res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
drivers/mtd/nand/atmel_nand.c +6 -6
@@ -331,13 +331,13 @@ static void atmel_write_buf(struct mtd_info *mtd, const u8 *buf, int len)* 12-bits 20-bytes 21-bytes * 24-bits 39-bytes 42-bytes */ -static int __devinit pmecc_get_ecc_bytes (int cap,int sector_size) +static int pmecc_get_ecc_bytes (int cap,int sector_size) {int m =12 + sector_size /512 ;return (m * cap +7 ) /8 ; } -static void __devinit pmecc_config_ecc_layout (struct nand_ecclayout *layout, +static void pmecc_config_ecc_layout (struct nand_ecclayout *layout,int oobsize,int ecc_len) {int i;
@@ -353,7 +353,7 @@ static void __devinit pmecc_config_ecc_layout(struct nand_ecclayout *layout, oobsize - ecc_len - layout->oobfree[0 ].offset; } -static void __devinit __iomem *pmecc_get_alpha_to (struct atmel_nand_host *host) +static void __iomem *pmecc_get_alpha_to (struct atmel_nand_host *host) {int table_size;
@@ -375,7 +375,7 @@ static void pmecc_data_free(struct atmel_nand_host *host)kfree (host->pmecc_delta); } -static int __devinit pmecc_data_alloc (struct atmel_nand_host *host) +static int pmecc_data_alloc (struct atmel_nand_host *host) {const int cap = host->pmecc_corr_cap;
@@ -1206,7 +1206,7 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) }#if defined(CONFIG_OF ) -static int __devinit atmel_of_init_port (struct atmel_nand_host *host, +static int atmel_of_init_port (struct atmel_nand_host *host,struct device_node *np) {u32 val, table_offset;
@@ -1293,7 +1293,7 @@ static int __devinit atmel_of_init_port(struct atmel_nand_host *host, return 0; }#else -static int __devinit atmel_of_init_port (struct atmel_nand_host *host, +static int atmel_of_init_port (struct atmel_nand_host *host,struct device_node *np) {return -EINVAL ;
drivers/mtd/nand/au1550nd.c +2 -2
@@ -382,7 +382,7 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, iwhile (!this->dev_ready (mtd)); } -static int __devinit find_nand_cs (unsigned long nand_base) +static int find_nand_cs (unsigned long nand_base) {void __iomem *base = (void __iomem *)KSEG1ADDR (AU1000_STATIC_MEM_PHYS_ADDR );
@@ -403,7 +403,7 @@ static int __devinit find_nand_cs(unsigned long nand_base)return -ENODEV ; } -static int __devinit au1550nd_probe (struct platform_device *pdev) +static int au1550nd_probe (struct platform_device *pdev) {struct au1550nd_platdata *pd;struct au1550nd_ctx *ctx;
drivers/mtd/nand/bf5xx_nand.c +2 -2
@@ -658,7 +658,7 @@ static int bf5xx_nand_hw_init(struct bf5xx_nand_info *info)/* * Device management interface */ -static int __devinit bf5xx_nand_add_partition (struct bf5xx_nand_info *info) +static int bf5xx_nand_add_partition (struct bf5xx_nand_info *info) {struct mtd_info *mtd = &info->mtd;struct mtd_partition *parts = info->platform->partitions;
@@ -725,7 +725,7 @@ static int bf5xx_nand_scan(struct mtd_info *mtd)* it can allocate all necessary resources then calls the * nand layer to look for devices */ -static int __devinit bf5xx_nand_probe (struct platform_device *pdev) +static int bf5xx_nand_probe (struct platform_device *pdev) {struct bf5xx_nand_platform *plat =to_nand_plat (pdev);struct bf5xx_nand_info *info =NULL ;
drivers/mtd/nand/cafe_nand.c +4 -4
@@ -585,7 +585,7 @@ static int cafe_nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip) }/* F_2[X]/(X**6+X+1) */ -static unsigned short __devinit gf64_mul (u8 a,u8 b) +static unsigned short gf64_mul (u8 a,u8 b) {u8 c;unsigned int i;
@@ -604,7 +604,7 @@ static unsigned short __devinit gf64_mul(u8 a, u8 b) }/* F_64[X]/(X**2+X+A**-1) with A the generator of F_64[X] */ -static u16 __devinit gf4096_mul (u16 a,u16 b) +static u16 gf4096_mul (u16 a,u16 b) {u8 ah, al, bh, bl, ch, cl;
@@ -619,14 +619,14 @@ static u16 __devinit gf4096_mul(u16 a, u16 b)return (ch <<6 ) ^ cl; } -static int __devinit cafe_mul (int x) +static int cafe_mul (int x) {if (x ==0 )return 1 ;return gf4096_mul (x,0xe01 ); } -static int __devinit cafe_nand_probe (struct pci_dev *pdev, +static int cafe_nand_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {struct mtd_info *mtd;
drivers/mtd/nand/denali_dt.c +1 -1
@@ -57,7 +57,7 @@ MODULE_DEVICE_TABLE(of, denali_nand_dt_ids);static u64 denali_dma_mask; -static int __devinit denali_dt_probe (struct platform_device *ofdev) +static int denali_dt_probe (struct platform_device *ofdev) {struct resource *denali_reg, *nand_data;struct denali_dt *dt;
drivers/mtd/nand/denali_pci.c +1 -1
@@ -130,7 +130,7 @@ static struct pci_driver denali_pci_driver = { .remove = denali_pci_remove, }; -static int __devinit denali_init_pci (void ) +static int denali_init_pci (void ) {pr_info ("Spectra MTD driver built on %s @ %s\n" , __DATE__, __TIME__);return pci_register_driver (&denali_pci_driver);
drivers/mtd/nand/fsl_elbc_nand.c +1 -1
@@ -799,7 +799,7 @@ static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv)static DEFINE_MUTEX (fsl_elbc_nand_mutex); -static int __devinit fsl_elbc_nand_probe (struct platform_device *pdev) +static int fsl_elbc_nand_probe (struct platform_device *pdev) {struct fsl_lbc_regs __iomem *lbc;struct fsl_elbc_mtd *priv;
drivers/mtd/nand/fsl_ifc_nand.c +1 -1
@@ -922,7 +922,7 @@ static int match_bank(struct fsl_ifc_regs __iomem *ifc, int bank,static DEFINE_MUTEX (fsl_ifc_nand_mutex); -static int __devinit fsl_ifc_nand_probe (struct platform_device *dev) +static int fsl_ifc_nand_probe (struct platform_device *dev) {struct fsl_ifc_regs __iomem *ifc;struct fsl_ifc_mtd *priv;
drivers/mtd/nand/fsl_upm.c +2 -2
@@ -152,7 +152,7 @@ static void fun_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)fun_wait_rnb (fun); } -static int __devinit fun_chip_init (struct fsl_upm_nand *fun, +static int fun_chip_init (struct fsl_upm_nand *fun,const struct device_node *upm_np,const struct resource *io_res) {
@@ -201,7 +201,7 @@ err:return ret; } -static int __devinit fun_probe (struct platform_device *ofdev) +static int fun_probe (struct platform_device *ofdev) {struct fsl_upm_nand *fun;struct resource io_res;
drivers/mtd/nand/fsmc_nand.c +2 -2
@@ -864,7 +864,7 @@ static bool filter(struct dma_chan *chan, void *slave) }#ifdef CONFIG_OF -static int __devinit fsmc_nand_probe_config_dt (struct platform_device *pdev, +static int fsmc_nand_probe_config_dt (struct platform_device *pdev,struct device_node *np) {struct fsmc_nand_platform_data *pdata =dev_get_platdata (&pdev->dev);
@@ -886,7 +886,7 @@ static int __devinit fsmc_nand_probe_config_dt(struct platform_device *pdev, return 0; }#else -static int __devinit fsmc_nand_probe_config_dt (struct platform_device *pdev, +static int fsmc_nand_probe_config_dt (struct platform_device *pdev,struct device_node *np) {return -ENOSYS ;
drivers/mtd/nand/gpio.c +1 -1
@@ -282,7 +282,7 @@ static void __iomem *request_and_remap(struct resource *res, size_t size,return ptr; } -static int __devinit gpio_nand_probe (struct platform_device *dev) +static int gpio_nand_probe (struct platform_device *dev) {struct gpiomtd *gpiomtd;struct nand_chip *this;
drivers/mtd/nand/gpmi-nand/gpmi-nand.c +8 -8
@@ -319,7 +319,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,return 0 ; } -static int __devinit +static int acquire_register_block (struct gpmi_nand_data *this,const char *res_name) {struct platform_device *pdev = this->pdev;
@@ -360,7 +360,7 @@ static void release_register_block(struct gpmi_nand_data *this) res->bch_regs =NULL ; } -static int __devinit +static int acquire_bch_irq (struct gpmi_nand_data *this,irq_handler_t irq_h) {struct platform_device *pdev = this->pdev;
@@ -427,7 +427,7 @@ static void release_dma_channels(struct gpmi_nand_data *this) } } -static int __devinit acquire_dma_channels (struct gpmi_nand_data *this) +static int acquire_dma_channels (struct gpmi_nand_data *this) {struct platform_device *pdev = this->pdev;struct resource *r_dma;
@@ -492,7 +492,7 @@ static char *extra_clks_for_mx6q[GPMI_CLK_MAX] = { "gpmi_apb", "gpmi_bch", "gpmi_bch_apb", "per1_bch", }; -static int __devinit gpmi_get_clks (struct gpmi_nand_data *this) +static int gpmi_get_clks (struct gpmi_nand_data *this) {struct resources *r = &this->resources;char **extra_clks =NULL ;
@@ -538,7 +538,7 @@ err_clock:return -ENOMEM ; } -static int __devinit acquire_resources (struct gpmi_nand_data *this) +static int acquire_resources (struct gpmi_nand_data *this) {struct pinctrl *pinctrl;int ret;
@@ -588,7 +588,7 @@ static void release_resources(struct gpmi_nand_data *this)release_dma_channels (this); } -static int __devinit init_hardware (struct gpmi_nand_data *this) +static int init_hardware (struct gpmi_nand_data *this) {int ret;
@@ -1542,7 +1542,7 @@ static void gpmi_nfc_exit(struct gpmi_nand_data *this)gpmi_free_dma_buffer (this); } -static int __devinit gpmi_nfc_init (struct gpmi_nand_data *this) +static int gpmi_nfc_init (struct gpmi_nand_data *this) {struct mtd_info *mtd = &this->mtd;struct nand_chip *chip = &this->nand;
@@ -1625,7 +1625,7 @@ static const struct of_device_id gpmi_nand_id_table[] = { };MODULE_DEVICE_TABLE (of, gpmi_nand_id_table); -static int __devinit gpmi_nand_probe (struct platform_device *pdev) +static int gpmi_nand_probe (struct platform_device *pdev) {struct gpmi_nand_data *this;const struct of_device_id *of_id;
drivers/mtd/nand/jz4740_nand.c +2 -2
@@ -322,7 +322,7 @@ static inline void jz_nand_iounmap_resource(struct resource *res, void __iomem *release_mem_region (res->start,resource_size (res)); } -static int __devinit jz_nand_detect_bank (struct platform_device *pdev,struct jz_nand *nand,unsigned char bank,size_t chipnr,uint8_t *nand_maf_id,uint8_t *nand_dev_id) { +static int jz_nand_detect_bank (struct platform_device *pdev,struct jz_nand *nand,unsigned char bank,size_t chipnr,uint8_t *nand_maf_id,uint8_t *nand_dev_id) {int ret;int gpio;char gpio_name[9 ];
@@ -400,7 +400,7 @@ notfound_gpio:return ret; } -static int __devinit jz_nand_probe (struct platform_device *pdev) +static int jz_nand_probe (struct platform_device *pdev) {int ret;struct jz_nand *nand;
drivers/mtd/nand/lpc32xx_mlc.c +1 -1
@@ -655,7 +655,7 @@ static struct lpc32xx_nand_cfg_mlc *lpc32xx_parse_dt(struct device *dev)/* * Probe for NAND controller */ -static int __devinit lpc32xx_nand_probe (struct platform_device *pdev) +static int lpc32xx_nand_probe (struct platform_device *pdev) {struct lpc32xx_nand_host *host;struct mtd_info *mtd;
drivers/mtd/nand/lpc32xx_slc.c +1 -1
@@ -755,7 +755,7 @@ static struct lpc32xx_nand_cfg_slc *lpc32xx_parse_dt(struct device *dev)/* * Probe for NAND controller */ -static int __devinit lpc32xx_nand_probe (struct platform_device *pdev) +static int lpc32xx_nand_probe (struct platform_device *pdev) {struct lpc32xx_nand_host *host;struct mtd_info *mtd;
drivers/mtd/nand/mpc5121_nfc.c +1 -1
@@ -626,7 +626,7 @@ static void mpc5121_nfc_free(struct device *dev, struct mtd_info *mtd)iounmap (prv->csreg); } -static int __devinit mpc5121_nfc_probe (struct platform_device *op) +static int mpc5121_nfc_probe (struct platform_device *op) {struct device_node *rootnode, *dn = op->dev.of_node;struct device *dev = &op->dev;
drivers/mtd/nand/mxc_nand.c +1 -1
@@ -1378,7 +1378,7 @@ static int __init mxcnd_probe_dt(struct mxc_nand_host *host) }#endif -static int __devinit mxcnd_probe (struct platform_device *pdev) +static int mxcnd_probe (struct platform_device *pdev) {struct nand_chip *this;struct mtd_info *mtd;
drivers/mtd/nand/ndfc.c +1 -1
@@ -197,7 +197,7 @@ err:return ret; } -static int __devinit ndfc_probe (struct platform_device *ofdev) +static int ndfc_probe (struct platform_device *ofdev) {struct ndfc_controller *ndfc;const __be32 *reg;
drivers/mtd/nand/nuc900_nand.c +1 -1
@@ -246,7 +246,7 @@ static void nuc900_nand_enable(struct nuc900_nand *nand)spin_unlock (&nand->lock); } -static int __devinit nuc900_nand_probe (struct platform_device *pdev) +static int nuc900_nand_probe (struct platform_device *pdev) {struct nuc900_nand *nuc900_nand;struct nand_chip *chip;
drivers/mtd/nand/omap2.c +1 -1
@@ -1324,7 +1324,7 @@ static void omap3_free_bch(struct mtd_info *mtd) }#endif /* CONFIG_MTD_NAND_OMAP_BCH */ -static int __devinit omap_nand_probe (struct platform_device *pdev) +static int omap_nand_probe (struct platform_device *pdev) {struct omap_nand_info *info;struct omap_nand_platform_data *pdata;
drivers/mtd/nand/pasemi_nand.c +1 -1
@@ -89,7 +89,7 @@ int pasemi_device_ready(struct mtd_info *mtd)return !!(inl (lpcctl) &LBICTRL_LPCCTL_NR ); } -static int __devinit pasemi_nand_probe (struct platform_device *ofdev) +static int pasemi_nand_probe (struct platform_device *ofdev) {struct pci_dev *pdev;struct device_node *np = ofdev->dev.of_node;
drivers/mtd/nand/plat_nand.c +1 -1
@@ -28,7 +28,7 @@ static const char *part_probe_types[] = { "cmdlinepart", NULL };/* * Probe for the NAND device. */ -static int __devinit plat_nand_probe (struct platform_device *pdev) +static int plat_nand_probe (struct platform_device *pdev) {struct platform_nand_data *pdata = pdev->dev.platform_data;struct mtd_part_parser_data ppdata;
drivers/mtd/nand/sh_flctl.c +1 -1
@@ -1088,7 +1088,7 @@ static struct sh_flctl_platform_data *flctl_parse_dt(struct device *dev) }#endif /* CONFIG_OF */ -static int __devinit flctl_probe (struct platform_device *pdev) +static int flctl_probe (struct platform_device *pdev) {struct resource *res;struct sh_flctl *flctl;
drivers/mtd/nand/sharpsl.c +1 -1
@@ -106,7 +106,7 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat,/* * Main initialization routine */ -static int __devinit sharpsl_nand_probe (struct platform_device *pdev) +static int sharpsl_nand_probe (struct platform_device *pdev) {struct nand_chip *this;struct resource *r;
drivers/mtd/nand/socrates_nand.c +1 -1
@@ -140,7 +140,7 @@ static int socrates_nand_device_ready(struct mtd_info *mtd)/* * Probe for the NAND device. */ -static int __devinit socrates_nand_probe (struct platform_device *ofdev) +static int socrates_nand_probe (struct platform_device *ofdev) {struct socrates_nand_host *host;struct mtd_info *mtd;
drivers/mtd/onenand/generic.c +1 -1
@@ -35,7 +35,7 @@ struct onenand_info {struct onenand_chip onenand; }; -static int __devinit generic_onenand_probe (struct platform_device *pdev) +static int generic_onenand_probe (struct platform_device *pdev) {struct onenand_info *info;struct onenand_platform_data *pdata = pdev->dev.platform_data;
drivers/mtd/onenand/omap2.c +1 -1
@@ -630,7 +630,7 @@ static int omap2_onenand_disable(struct mtd_info *mtd)return ret; } -static int __devinit omap2_onenand_probe (struct platform_device *pdev) +static int omap2_onenand_probe (struct platform_device *pdev) {struct omap_onenand_platform_data *pdata;struct omap2_onenand *c;
Signature · 1 line
1.8.0
PATCH 238/493 mtd: remove use of __devinit
Quoted 2 lines · Bill Pemberton
drivers/mtd/maps/pismo.c | 14 +++++++------- drivers/mtd/maps/sa1100-flash.c | 5 ++---
For these two,
Acked-by Russell King <[email protected]>
PATCH 239/493 nfc: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Lauro Ramos Venancio <[email protected]>
Cc Aloisio Almeida Jr <[email protected]>
Cc Samuel Ortiz <[email protected]>
--- drivers/nfc/pn544/i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nfc/pn544/i2c.c +1 -1
@@ -361,7 +361,7 @@ static struct nfc_phy_ops i2c_phy_ops = { .disable = pn544_hci_i2c_disable, }; -static int __devinit pn544_hci_i2c_probe (struct i2c_client *client, +static int pn544_hci_i2c_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct pn544_i2c_phy *phy;
Signature · 1 line
1.8.0
PATCH 240/493 parisc: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc Helge Deller <[email protected]>
--- arch/parisc/include/asm/parport.h | 2 +- arch/parisc/kernel/hardware.c | 3 +-- drivers/parisc/dino.c | 2 +- drivers/parisc/lba_pci.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)
arch/parisc/include/asm/parport.h +1 -1
@@ -8,7 +8,7 @@#define _ASM_PARPORT_H 1 -static int __devinit parport_pc_find_nonpci_ports (int autoirq,int autodma) +static int parport_pc_find_nonpci_ports (int autoirq,int autodma) {/* nothing ! */ return 0 ;
arch/parisc/kernel/hardware.c +1 -2
@@ -1327,8 +1327,7 @@ const char * const cpu_name_version[][2] = { [mako2] = { "PA8900 (Shortfin)", "2.0" } }; -const char *__devinit -parisc_hardware_description (struct parisc_device_id *id) +const char *parisc_hardware_description (struct parisc_device_id *id) {struct hp_hardware *listptr;
drivers/parisc/dino.c +1 -1
@@ -430,7 +430,7 @@ static void dino_choose_irq(struct parisc_device *dev, void *ctrl)* Cirrus 6832 Cardbus reports wrong irq on RDI Tadpole PARISC Laptop ([email protected]) * (the irqs are off-by-one, not sure yet if this is a cirrus, dino-hardware or dino-driver problem...) */ -static void __devinit quirk_cirrus_cardbus (struct pci_dev *dev) +static void quirk_cirrus_cardbus (struct pci_dev *dev) {u8 new_irq = dev->irq -1 ; printk(KERN_INFO "PCI: Cirrus Cardbus IRQ fixup for %s, from %d to %d\n",
drivers/parisc/lba_pci.c +1 -1
@@ -34,7 +34,7 @@#include <linux/types.h> #include <linux/kernel.h> #include <linux/spinlock.h> -#include <linux/init.h> /* for __init and __devinit */ +#include <linux/init.h> /* for __init and */ #include <linux/pci.h> #include <linux/ioport.h> #include <linux/slab.h>
Signature · 1 line
1.8.0
PATCH 242/493 pci: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
--- drivers/pci/ioapic.c | 2 +- drivers/pci/pci.c | 2 +- drivers/pci/pcie/aer/aerdrv.c | 4 +- drivers/pci/pcie/portdrv_pci.c | 2 +- drivers/pci/probe.c | 18 +++--- drivers/pci/quirks.c | 134 ++++++++++++++++++++--------------------- drivers/pci/xen-pcifront.c | 10 +-- include/linux/pci.h | 2 +- 8 files changed, 87 insertions(+), 87 deletions(-)
drivers/pci/ioapic.c +1 -1
@@ -27,7 +27,7 @@ struct ioapic {u32 gsi_base; }; -static int __devinit ioapic_probe (struct pci_dev *dev,const struct pci_device_id *ent) +static int ioapic_probe (struct pci_dev *dev,const struct pci_device_id *ent) {acpi_handle handle;acpi_status status;
drivers/pci/pci.c +1 -1
@@ -3867,7 +3867,7 @@ static int __init pci_resource_alignment_sysfs_init(void)late_initcall (pci_resource_alignment_sysfs_init); -static void __devinit pci_no_domains (void ) +static void pci_no_domains (void ) {#ifdef CONFIG_PCI_DOMAINS pci_domains_supported =0 ;
drivers/pci/pcie/aer/aerdrv.c +2 -2
@@ -41,7 +41,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR);MODULE_DESCRIPTION (DRIVER_DESC );MODULE_LICENSE ("GPL" ); -static int __devinit aer_probe (struct pcie_device *dev); +static int aer_probe (struct pcie_device *dev);static void aer_remove (struct pcie_device *dev);static pci_ers_result_t aer_error_detected (struct pci_dev *dev,enum pci_channel_state error);
@@ -300,7 +300,7 @@ static void aer_remove(struct pcie_device *dev)* * Invoked when PCI Express bus loads AER service driver. */ -static int __devinit aer_probe (struct pcie_device *dev) +static int aer_probe (struct pcie_device *dev) {int status;struct aer_rpc *rpc;
drivers/pci/pcie/portdrv_pci.c +1 -1
@@ -182,7 +182,7 @@ static const struct pci_device_id port_runtime_pm_black_list[] = {* this port device. * */ -static int __devinit pcie_portdrv_probe (struct pci_dev *dev, +static int pcie_portdrv_probe (struct pci_dev *dev,const struct pci_device_id *id) {int status;
drivers/pci/probe.c +9 -9
@@ -305,7 +305,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) } } -static void __devinit pci_read_bridge_io (struct pci_bus *child) +static void pci_read_bridge_io (struct pci_bus *child) {struct pci_dev *dev = child->self;u8 io_base_lo, io_limit_lo;
@@ -345,7 +345,7 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child) } } -static void __devinit pci_read_bridge_mmio (struct pci_bus *child) +static void pci_read_bridge_mmio (struct pci_bus *child) {struct pci_dev *dev = child->self;u16 mem_base_lo, mem_limit_lo;
@@ -367,7 +367,7 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child) } } -static void __devinit pci_read_bridge_mmio_pref (struct pci_bus *child) +static void pci_read_bridge_mmio_pref (struct pci_bus *child) {struct pci_dev *dev = child->self;u16 mem_base_lo, mem_limit_lo;
@@ -417,7 +417,7 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child) } } -void __devinit pci_read_bridge_bases (struct pci_bus *child) +void pci_read_bridge_bases (struct pci_bus *child) {struct pci_dev *dev = child->self;struct resource *res;
@@ -705,7 +705,7 @@ static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)* them, we proceed to assigning numbers to the remaining buses in * order to avoid overlaps between old and new bus numbers. */ -int __devinit pci_scan_bridge (struct pci_bus *bus,struct pci_dev *dev,int max,int pass) +int pci_scan_bridge (struct pci_bus *bus,struct pci_dev *dev,int max,int pass) {struct pci_bus *child;int is_cardbus = (dev->hdr_type ==PCI_HEADER_TYPE_CARDBUS );
@@ -1587,7 +1587,7 @@ void pcie_bus_configure_settings(struct pci_bus *bus, u8 mpss) }EXPORT_SYMBOL_GPL (pcie_bus_configure_settings); -unsigned int __devinit pci_scan_child_bus (struct pci_bus *bus) +unsigned int pci_scan_child_bus (struct pci_bus *bus) {unsigned int devfn, pass, max = bus->busn_res.start;struct pci_dev *dev;
@@ -1791,7 +1791,7 @@ void pci_bus_release_busn_res(struct pci_bus *b) res, ret ? "can not be" : "is"); } -struct pci_bus *__devinit pci_scan_root_bus (struct device *parent,int bus, +struct pci_bus *pci_scan_root_bus (struct device *parent,int bus,struct pci_ops *ops,void *sysdata,struct list_head *resources) {struct pci_host_bridge_window *window;
@@ -1827,7 +1827,7 @@ struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,EXPORT_SYMBOL (pci_scan_root_bus);/* Deprecated; use pci_scan_root_bus() instead */ -struct pci_bus *__devinit pci_scan_bus_parented (struct device *parent, +struct pci_bus *pci_scan_bus_parented (struct device *parent,int bus,struct pci_ops *ops,void *sysdata) {LIST_HEAD (resources);
@@ -1845,7 +1845,7 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, }EXPORT_SYMBOL (pci_scan_bus_parented); -struct pci_bus *__devinit pci_scan_bus (int bus,struct pci_ops *ops, +struct pci_bus *pci_scan_bus (int bus,struct pci_ops *ops,void *sysdata) {LIST_HEAD (resources);
drivers/pci/quirks.c +67 -67
533 lines not on this page · raw message
drivers/pci/xen-pcifront.c +5 -5
@@ -412,7 +412,7 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data)return 0 ; } -static int __devinit pcifront_scan_bus (struct pcifront_device *pdev, +static int pcifront_scan_bus (struct pcifront_device *pdev,unsigned int domain,unsigned int bus,struct pci_bus *b) {
@@ -441,7 +441,7 @@ static int __devinit pcifront_scan_bus(struct pcifront_device *pdev,return 0 ; } -static int __devinit pcifront_scan_root (struct pcifront_device *pdev, +static int pcifront_scan_root (struct pcifront_device *pdev,unsigned int domain,unsigned int bus) {struct pci_bus *b;
@@ -503,7 +503,7 @@ err_out:return err; } -static int __devinit pcifront_rescan_root (struct pcifront_device *pdev, +static int pcifront_rescan_root (struct pcifront_device *pdev,unsigned int domain,unsigned int bus) {int err;
@@ -834,7 +834,7 @@ out:return err; } -static int __devinit pcifront_try_connect (struct pcifront_device *pdev) +static int pcifront_try_connect (struct pcifront_device *pdev) {int err = -EFAULT ;int i, num_roots, len;
@@ -924,7 +924,7 @@ out:return err; } -static int __devinit pcifront_attach_devices (struct pcifront_device *pdev) +static int pcifront_attach_devices (struct pcifront_device *pdev) {int err = -EFAULT ;int i, num_roots, len;
include/linux/pci.h +1 -1
@@ -687,7 +687,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,int pci_bus_insert_busn_res (struct pci_bus *b,int bus,int busmax);int pci_bus_update_busn_res_end (struct pci_bus *b,int busmax);void pci_bus_release_busn_res (struct pci_bus *b); -struct pci_bus *__devinit pci_scan_root_bus (struct device *parent,int bus, +struct pci_bus *pci_scan_root_bus (struct device *parent,int bus,struct pci_ops *ops,void *sysdata,struct list_head *resources); struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,
Signature · 1 line
1.8.0
PATCH 242/493 pci: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
--- drivers/pci/ioapic.c | 2 +- drivers/pci/pci.c | 2 +- drivers/pci/pcie/aer/aerdrv.c | 4 +- drivers/pci/pcie/portdrv_pci.c | 2 +- drivers/pci/probe.c | 18 +++--- drivers/pci/quirks.c | 134 ++++++++++++++++++++--------------------- drivers/pci/xen-pcifront.c | 10 +-- include/linux/pci.h | 2 +- 8 files changed, 87 insertions(+), 87 deletions(-)
drivers/pci/ioapic.c +1 -1
@@ -27,7 +27,7 @@ struct ioapic {u32 gsi_base; }; -static int __devinit ioapic_probe (struct pci_dev *dev,const struct pci_device_id *ent) +static int ioapic_probe (struct pci_dev *dev,const struct pci_device_id *ent) {acpi_handle handle;acpi_status status;
drivers/pci/pci.c +1 -1
@@ -3867,7 +3867,7 @@ static int __init pci_resource_alignment_sysfs_init(void)late_initcall (pci_resource_alignment_sysfs_init); -static void __devinit pci_no_domains (void ) +static void pci_no_domains (void ) {#ifdef CONFIG_PCI_DOMAINS pci_domains_supported =0 ;
drivers/pci/pcie/aer/aerdrv.c +2 -2
@@ -41,7 +41,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR);MODULE_DESCRIPTION (DRIVER_DESC );MODULE_LICENSE ("GPL" ); -static int __devinit aer_probe (struct pcie_device *dev); +static int aer_probe (struct pcie_device *dev);static void aer_remove (struct pcie_device *dev);static pci_ers_result_t aer_error_detected (struct pci_dev *dev,enum pci_channel_state error);
@@ -300,7 +300,7 @@ static void aer_remove(struct pcie_device *dev)* * Invoked when PCI Express bus loads AER service driver. */ -static int __devinit aer_probe (struct pcie_device *dev) +static int aer_probe (struct pcie_device *dev) {int status;struct aer_rpc *rpc;
drivers/pci/pcie/portdrv_pci.c +1 -1
@@ -182,7 +182,7 @@ static const struct pci_device_id port_runtime_pm_black_list[] = {* this port device. * */ -static int __devinit pcie_portdrv_probe (struct pci_dev *dev, +static int pcie_portdrv_probe (struct pci_dev *dev,const struct pci_device_id *id) {int status;
drivers/pci/probe.c +9 -9
@@ -305,7 +305,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) } } -static void __devinit pci_read_bridge_io (struct pci_bus *child) +static void pci_read_bridge_io (struct pci_bus *child) {struct pci_dev *dev = child->self;u8 io_base_lo, io_limit_lo;
@@ -345,7 +345,7 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child) } } -static void __devinit pci_read_bridge_mmio (struct pci_bus *child) +static void pci_read_bridge_mmio (struct pci_bus *child) {struct pci_dev *dev = child->self;u16 mem_base_lo, mem_limit_lo;
@@ -367,7 +367,7 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child) } } -static void __devinit pci_read_bridge_mmio_pref (struct pci_bus *child) +static void pci_read_bridge_mmio_pref (struct pci_bus *child) {struct pci_dev *dev = child->self;u16 mem_base_lo, mem_limit_lo;
@@ -417,7 +417,7 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child) } } -void __devinit pci_read_bridge_bases (struct pci_bus *child) +void pci_read_bridge_bases (struct pci_bus *child) {struct pci_dev *dev = child->self;struct resource *res;
@@ -705,7 +705,7 @@ static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)* them, we proceed to assigning numbers to the remaining buses in * order to avoid overlaps between old and new bus numbers. */ -int __devinit pci_scan_bridge (struct pci_bus *bus,struct pci_dev *dev,int max,int pass) +int pci_scan_bridge (struct pci_bus *bus,struct pci_dev *dev,int max,int pass) {struct pci_bus *child;int is_cardbus = (dev->hdr_type ==PCI_HEADER_TYPE_CARDBUS );
@@ -1587,7 +1587,7 @@ void pcie_bus_configure_settings(struct pci_bus *bus, u8 mpss) }EXPORT_SYMBOL_GPL (pcie_bus_configure_settings); -unsigned int __devinit pci_scan_child_bus (struct pci_bus *bus) +unsigned int pci_scan_child_bus (struct pci_bus *bus) {unsigned int devfn, pass, max = bus->busn_res.start;struct pci_dev *dev;
@@ -1791,7 +1791,7 @@ void pci_bus_release_busn_res(struct pci_bus *b) res, ret ? "can not be" : "is"); } -struct pci_bus *__devinit pci_scan_root_bus (struct device *parent,int bus, +struct pci_bus *pci_scan_root_bus (struct device *parent,int bus,struct pci_ops *ops,void *sysdata,struct list_head *resources) {struct pci_host_bridge_window *window;
@@ -1827,7 +1827,7 @@ struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,EXPORT_SYMBOL (pci_scan_root_bus);/* Deprecated; use pci_scan_root_bus() instead */ -struct pci_bus *__devinit pci_scan_bus_parented (struct device *parent, +struct pci_bus *pci_scan_bus_parented (struct device *parent,int bus,struct pci_ops *ops,void *sysdata) {LIST_HEAD (resources);
@@ -1845,7 +1845,7 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, }EXPORT_SYMBOL (pci_scan_bus_parented); -struct pci_bus *__devinit pci_scan_bus (int bus,struct pci_ops *ops, +struct pci_bus *pci_scan_bus (int bus,struct pci_ops *ops,void *sysdata) {LIST_HEAD (resources);
drivers/pci/quirks.c +67 -67
533 lines not on this page · raw message
drivers/pci/xen-pcifront.c +5 -5
@@ -412,7 +412,7 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data)return 0 ; } -static int __devinit pcifront_scan_bus (struct pcifront_device *pdev, +static int pcifront_scan_bus (struct pcifront_device *pdev,unsigned int domain,unsigned int bus,struct pci_bus *b) {
@@ -441,7 +441,7 @@ static int __devinit pcifront_scan_bus(struct pcifront_device *pdev,return 0 ; } -static int __devinit pcifront_scan_root (struct pcifront_device *pdev, +static int pcifront_scan_root (struct pcifront_device *pdev,unsigned int domain,unsigned int bus) {struct pci_bus *b;
@@ -503,7 +503,7 @@ err_out:return err; } -static int __devinit pcifront_rescan_root (struct pcifront_device *pdev, +static int pcifront_rescan_root (struct pcifront_device *pdev,unsigned int domain,unsigned int bus) {int err;
@@ -834,7 +834,7 @@ out:return err; } -static int __devinit pcifront_try_connect (struct pcifront_device *pdev) +static int pcifront_try_connect (struct pcifront_device *pdev) {int err = -EFAULT ;int i, num_roots, len;
@@ -924,7 +924,7 @@ out:return err; } -static int __devinit pcifront_attach_devices (struct pcifront_device *pdev) +static int pcifront_attach_devices (struct pcifront_device *pdev) {int err = -EFAULT ;int i, num_roots, len;
include/linux/pci.h +1 -1
@@ -687,7 +687,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,int pci_bus_insert_busn_res (struct pci_bus *b,int bus,int busmax);int pci_bus_update_busn_res_end (struct pci_bus *b,int busmax);void pci_bus_release_busn_res (struct pci_bus *b); -struct pci_bus *__devinit pci_scan_root_bus (struct device *parent,int bus, +struct pci_bus *pci_scan_root_bus (struct device *parent,int bus,struct pci_ops *ops,void *sysdata,struct list_head *resources); struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,
Signature · 1 line
1.8.0
PATCH 243/493 pcmcia: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Eric Miao <[email protected]>
Cc Russell King <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc linux-pcmcia at lists.infradead.org
Cc linux-arm-kernel at lists.infradead.org
--- drivers/pcmcia/bcm63xx_pcmcia.c | 4 ++-- drivers/pcmcia/bfin_cf_pcmcia.c | 2 +- drivers/pcmcia/db1xxx_ss.c | 2 +- drivers/pcmcia/ds.c | 2 +- drivers/pcmcia/electra_cf.c | 2 +- drivers/pcmcia/i82092.c | 2 +- drivers/pcmcia/pd6729.c | 4 ++-- drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- drivers/pcmcia/rsrc_nonstatic.c | 2 +- drivers/pcmcia/sa1100_assabet.c | 2 +- drivers/pcmcia/sa1100_cerf.c | 2 +- drivers/pcmcia/sa1100_generic.c | 2 +- drivers/pcmcia/sa1100_h3600.c | 2 +- drivers/pcmcia/sa1100_shannon.c | 2 +- drivers/pcmcia/sa1100_simpad.c | 2 +- drivers/pcmcia/sa1111_jornada720.c | 2 +- drivers/pcmcia/vrc4171_card.c | 6 +++--- drivers/pcmcia/vrc4173_cardu.c | 6 +++--- drivers/pcmcia/xxs1500_ss.c | 2 +- drivers/pcmcia/yenta_socket.c | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-)
drivers/pcmcia/bcm63xx_pcmcia.c +2 -2
@@ -323,7 +323,7 @@ static struct pccard_operations bcm63xx_pcmcia_operations = {/* * register pcmcia socket to core */ -static int __devinit bcm63xx_drv_pcmcia_probe (struct platform_device *pdev) +static int bcm63xx_drv_pcmcia_probe (struct platform_device *pdev) {struct bcm63xx_pcmcia_socket *skt;struct pcmcia_socket *sock;
@@ -461,7 +461,7 @@ struct platform_driver bcm63xx_pcmcia_driver = { };#ifdef CONFIG_CARDBUS -static int __devinit bcm63xx_cb_probe (struct pci_dev *dev, +static int bcm63xx_cb_probe (struct pci_dev *dev,const struct pci_device_id *id) {/* keep pci device */
drivers/pcmcia/bfin_cf_pcmcia.c +1 -1
@@ -195,7 +195,7 @@ static struct pccard_operations bfin_cf_ops = {/*--------------------------------------------------------------------------*/ -static int __devinit bfin_cf_probe (struct platform_device *pdev) +static int bfin_cf_probe (struct platform_device *pdev) {struct bfin_cf_socket *cf;struct resource *io_mem, *attr_mem;
drivers/pcmcia/db1xxx_ss.c +1 -1
@@ -409,7 +409,7 @@ static struct pccard_operations db1x_pcmcia_operations = { .set_mem_map = au1x00_pcmcia_set_mem_map, }; -static int __devinit db1x_pcmcia_socket_probe (struct platform_device *pdev) +static int db1x_pcmcia_socket_probe (struct platform_device *pdev) {struct db1x_pcmcia_sock *sock;struct resource *r;
drivers/pcmcia/ds.c +1 -1
@@ -1318,7 +1318,7 @@ static struct pcmcia_callback pcmcia_bus_callback = { .resume = pcmcia_bus_resume, }; -static int __devinit pcmcia_bus_add_socket (struct device *dev, +static int pcmcia_bus_add_socket (struct device *dev,struct class_interface *class_intf) {struct pcmcia_socket *socket =dev_get_drvdata (dev);
drivers/pcmcia/electra_cf.c +1 -1
@@ -181,7 +181,7 @@ static struct pccard_operations electra_cf_ops = { .set_mem_map = electra_cf_set_mem_map, }; -static int __devinit electra_cf_probe (struct platform_device *ofdev) +static int electra_cf_probe (struct platform_device *ofdev) {struct device *device = &ofdev->dev;struct device_node *np = ofdev->dev.of_node;
drivers/pcmcia/i82092.c +1 -1
@@ -67,7 +67,7 @@ static struct socket_info sockets[MAX_SOCKETS];static int socket_count;/* shortcut */ -static int __devinit i82092aa_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) +static int i82092aa_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) {unsigned char configbyte;int i, ret;
drivers/pcmcia/pd6729.c +2 -2
@@ -589,7 +589,7 @@ static int pd6729_check_irq(int irq)return 0 ; } -static u_int __devinit pd6729_isa_scan (void ) +static u_int pd6729_isa_scan (void ) {u_int mask0, mask =0 ;int i;
@@ -620,7 +620,7 @@ static u_int __devinit pd6729_isa_scan(void)return mask; } -static int __devinit pd6729_pci_probe (struct pci_dev *dev, +static int pd6729_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) {int i, j, ret;
drivers/pcmcia/pxa2xx_sharpsl.c +1 -1
@@ -208,7 +208,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops = {#ifdef CONFIG_SA1100_COLLIE #include "sa11xx_base.h" -int __devinit pcmcia_collie_init (struct device *dev) +int pcmcia_collie_init (struct device *dev) {int ret = -ENODEV ;
drivers/pcmcia/rsrc_nonstatic.c +1 -1
@@ -1199,7 +1199,7 @@ static const struct attribute_group rsrc_attributes = { .attrs = pccard_rsrc_attributes, }; -static int __devinit pccard_sysfs_add_rsrc (struct device *dev, +static int pccard_sysfs_add_rsrc (struct device *dev,struct class_interface *class_intf) {struct pcmcia_socket *s =dev_get_drvdata (dev);
drivers/pcmcia/sa1100_assabet.c +1 -1
@@ -95,7 +95,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = { .socket_suspend = assabet_pcmcia_socket_suspend, }; -int __devinit pcmcia_assabet_init (struct device *dev) +int pcmcia_assabet_init (struct device *dev) {int ret = -ENODEV ;
drivers/pcmcia/sa1100_cerf.c +1 -1
@@ -81,7 +81,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = { .configure_socket = cerf_pcmcia_configure_socket, }; -int __devinit pcmcia_cerf_init (struct device *dev) +int pcmcia_cerf_init (struct device *dev) {int ret = -ENODEV ;
drivers/pcmcia/sa1100_generic.c +1 -1
@@ -67,7 +67,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) __devinitdata = {#endif }; -static int __devinit sa11x0_drv_pcmcia_probe (struct platform_device *dev) +static int sa11x0_drv_pcmcia_probe (struct platform_device *dev) {int i, ret = -ENODEV ;
drivers/pcmcia/sa1100_h3600.c +1 -1
@@ -153,7 +153,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = { .socket_suspend = h3600_pcmcia_socket_suspend, }; -int __devinit pcmcia_h3600_init (struct device *dev) +int pcmcia_h3600_init (struct device *dev) {int ret = -ENODEV ;
drivers/pcmcia/sa1100_shannon.c +1 -1
@@ -92,7 +92,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = { .configure_socket = shannon_pcmcia_configure_socket, }; -int __devinit pcmcia_shannon_init (struct device *dev) +int pcmcia_shannon_init (struct device *dev) {int ret = -ENODEV ;
drivers/pcmcia/sa1100_simpad.c +1 -1
@@ -109,7 +109,7 @@ static struct pcmcia_low_level simpad_pcmcia_ops = { .socket_suspend = simpad_pcmcia_socket_suspend, }; -int __devinit pcmcia_simpad_init (struct device *dev) +int pcmcia_simpad_init (struct device *dev) {int ret = -ENODEV ;
drivers/pcmcia/sa1111_jornada720.c +1 -1
@@ -91,7 +91,7 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = { .nr = 2, }; -int __devinit pcmcia_jornada720_init (struct device *dev) +int pcmcia_jornada720_init (struct device *dev) {int ret = -ENODEV ;
drivers/pcmcia/vrc4171_card.c +3 -3
@@ -564,7 +564,7 @@ static inline void reserve_using_irq(int slot) vrc4171_irq_mask &= ~(1 << irq); } -static int __devinit vrc4171_add_sockets (void ) +static int vrc4171_add_sockets (void ) {vrc4171_socket_t *socket;int slot, retval;
@@ -631,7 +631,7 @@ static void vrc4171_remove_sockets(void) } } -static int __devinit vrc4171_card_setup (char *options) +static int vrc4171_card_setup (char *options) {if (options ==NULL || *options =='\0' )return 1 ;
@@ -712,7 +712,7 @@ static struct platform_driver vrc4171_card_driver = { }, }; -static int __devinit vrc4171_card_init (void ) +static int vrc4171_card_init (void ) {int retval;
drivers/pcmcia/vrc4173_cardu.c +3 -3
@@ -456,7 +456,7 @@ static void cardu_interrupt(int irq, void *dev_id) } } -static int __devinit vrc4173_cardu_probe (struct pci_dev *dev, +static int vrc4173_cardu_probe (struct pci_dev *dev,const struct pci_device_id *ent) {vrc4173_socket_t *socket;
@@ -533,7 +533,7 @@ disable:return ret; } -static int __devinit vrc4173_cardu_setup (char *options) +static int vrc4173_cardu_setup (char *options) {if (options ==NULL || *options =='\0' )return 1 ;
@@ -574,7 +574,7 @@ static struct pci_driver vrc4173_cardu_driver = { .id_table = vrc4173_cardu_id_table, }; -static int __devinit vrc4173_cardu_init (void ) +static int vrc4173_cardu_init (void ) { vrc4173_cardu_slots =0 ;
drivers/pcmcia/xxs1500_ss.c +1 -1
@@ -204,7 +204,7 @@ static struct pccard_operations xxs1500_pcmcia_operations = { .set_mem_map = au1x00_pcmcia_set_mem_map, }; -static int __devinit xxs1500_pcmcia_probe (struct platform_device *pdev) +static int xxs1500_pcmcia_probe (struct platform_device *pdev) {struct xxs1500_pcmcia_sock *sock;struct resource *r;
drivers/pcmcia/yenta_socket.c +1 -1
@@ -1142,7 +1142,7 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)* interrupt, and that we can map the cardbus area. Fill in the * socket information structure.. */ -static int __devinit yenta_probe (struct pci_dev *dev,const struct pci_device_id *id) +static int yenta_probe (struct pci_dev *dev,const struct pci_device_id *id) {struct yenta_socket *socket;int ret;
Signature · 1 line
1.8.0
PATCH 243/493 pcmcia: remove use of __devinit
Quoted 3 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.
Acked-by Eric Miao <[email protected]>
PATCH 244/493 ps3: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Geoff Levand <[email protected]>
--- drivers/ps3/ps3-lpm.c | 2 +- drivers/ps3/ps3-sys-manager.c | 2 +- drivers/ps3/ps3av.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/ps3/ps3-lpm.c +1 -1
@@ -1185,7 +1185,7 @@ int ps3_lpm_close(void) }EXPORT_SYMBOL_GPL (ps3_lpm_close); -static int __devinit ps3_lpm_probe (struct ps3_system_bus_device *dev) +static int ps3_lpm_probe (struct ps3_system_bus_device *dev) {dev_dbg (&dev->core," -> %s:%u\n" , __func__, __LINE__);
drivers/ps3/ps3-sys-manager.c +1 -1
@@ -706,7 +706,7 @@ static void ps3_sys_manager_work(struct ps3_system_bus_device *dev)ps3_vuart_read_async (dev,PS3_SM_RX_MSG_LEN_MIN ); } -static int __devinit ps3_sys_manager_probe (struct ps3_system_bus_device *dev) +static int ps3_sys_manager_probe (struct ps3_system_bus_device *dev) {int result;struct ps3_sys_manager_ops ops;
drivers/ps3/ps3av.c +1 -1
@@ -932,7 +932,7 @@ int ps3av_audio_mute(int mute) }EXPORT_SYMBOL_GPL (ps3av_audio_mute); -static int __devinit ps3av_probe (struct ps3_system_bus_device *dev) +static int ps3av_probe (struct ps3_system_bus_device *dev) {int res;int id;
Signature · 1 line
1.8.0
PATCH 247/493 drivers/block: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Chirag Kantharia <[email protected]>
Cc Geoff Levand <[email protected]>
Cc Jim Paris <[email protected]>
Cc Rusty Russell <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
Cc Grant Likely <[email protected]>
--- drivers/block/cciss.c | 62 +++++++++++++++++++++++----------------------- drivers/block/cpqarray.c | 6 ++--- drivers/block/nvme.c | 10 ++++---- drivers/block/ps3disk.c | 2 +- drivers/block/ps3vram.c | 4 +-- drivers/block/sunvdc.c | 6 ++--- drivers/block/swim.c | 6 ++--- drivers/block/swim3.c | 2 +- drivers/block/umem.c | 2 +- drivers/block/virtio_blk.c | 4 +-- drivers/block/xsysace.c | 6 ++--- 11 files changed, 55 insertions(+), 55 deletions(-)
drivers/block/cciss.c +31 -31
@@ -181,8 +181,8 @@ static void cciss_geometry_inquiry(ctlr_info_t *h, int logvol,sector_t total_size, unsigned int block_size, InquiryData_struct *inq_buff, drive_info_struct *drv); -static void __devinit cciss_interrupt_mode (ctlr_info_t *); -static int __devinit cciss_enter_simple_mode (struct ctlr_info *h); +static void cciss_interrupt_mode (ctlr_info_t *); +static int cciss_enter_simple_mode (struct ctlr_info *h);static void start_io (ctlr_info_t *h); static int sendcmd_withirq(ctlr_info_t *h, __u8 cmd, void *buff, size_t size, __u8 page_code, unsigned char scsi3addr[],
@@ -199,13 +199,13 @@ static void cciss_device_release(struct device *dev);static void cciss_free_gendisk (ctlr_info_t *h,int drv_index);static void cciss_free_drive_info (ctlr_info_t *h,int drv_index);static inline u32 next_command (ctlr_info_t *h); -static int __devinit cciss_find_cfg_addrs (struct pci_dev *pdev, +static int cciss_find_cfg_addrs (struct pci_dev *pdev,void __iomem *vaddr,u32 *cfg_base_addr,u64 *cfg_base_addr_index,u64 *cfg_offset); -static int __devinit cciss_pci_find_memory_BAR (struct pci_dev *pdev, +static int cciss_pci_find_memory_BAR (struct pci_dev *pdev,unsigned long *memory_bar);static inline u32 cciss_tag_discard_error_bits (ctlr_info_t *h,u32 tag); -static __devinit int write_driver_ver_to_cfgtable ( +static int write_driver_ver_to_cfgtable (CfgTable_struct __iomem *cfgtable);/* performant mode helper functions */
@@ -550,7 +550,7 @@ static const struct file_operations cciss_proc_fops = { .write = cciss_proc_write, }; -static void __devinit cciss_procinit (ctlr_info_t *h) +static void cciss_procinit (ctlr_info_t *h) {struct proc_dir_entry *pde;
@@ -2663,7 +2663,7 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff,return status; } -static int __devinit cciss_send_reset (ctlr_info_t *h,unsigned char *scsi3addr, +static int cciss_send_reset (ctlr_info_t *h,unsigned char *scsi3addr,u8 reset_type) {CommandList_struct *c;
@@ -3919,7 +3919,7 @@ static void calc_bucket_map(int bucket[], int num_buckets, } } -static void __devinit cciss_wait_for_mode_change_ack (ctlr_info_t *h) +static void cciss_wait_for_mode_change_ack (ctlr_info_t *h) {int i;
@@ -3933,7 +3933,7 @@ static void __devinit cciss_wait_for_mode_change_ack(ctlr_info_t *h) } } -static __devinit void cciss_enter_performant_mode (ctlr_info_t *h, +static void cciss_enter_performant_mode (ctlr_info_t *h,u32 use_short_tags) {/* This is a bit complicated. There are 8 registers on
@@ -4000,7 +4000,7 @@ static __devinit void cciss_enter_performant_mode(ctlr_info_t *h, " performant mode\n"); } -static void __devinit cciss_put_controller_into_performant_mode (ctlr_info_t *h) +static void cciss_put_controller_into_performant_mode (ctlr_info_t *h) {__u32 trans_support;
@@ -4062,7 +4062,7 @@ clean_up:* controllers that are capable. If not, we use IO-APIC mode. */ -static void __devinit cciss_interrupt_mode (ctlr_info_t *h) +static void cciss_interrupt_mode (ctlr_info_t *h) {#ifdef CONFIG_PCI_MSI int err;
@@ -4108,7 +4108,7 @@ default_int_mode:return ; } -static int __devinit cciss_lookup_board_id (struct pci_dev *pdev,u32 *board_id) +static int cciss_lookup_board_id (struct pci_dev *pdev,u32 *board_id) {int i;u32 subsystem_vendor_id, subsystem_device_id;
@@ -4134,7 +4134,7 @@ static inline bool cciss_board_disabled(ctlr_info_t *h)return ((command &PCI_COMMAND_MEMORY ) ==0 ); } -static int __devinit cciss_pci_find_memory_BAR (struct pci_dev *pdev, +static int cciss_pci_find_memory_BAR (struct pci_dev *pdev,unsigned long *memory_bar) {int i;
@@ -4151,7 +4151,7 @@ static int __devinit cciss_pci_find_memory_BAR(struct pci_dev *pdev,return -ENODEV ; } -static int __devinit cciss_wait_for_board_state (struct pci_dev *pdev, +static int cciss_wait_for_board_state (struct pci_dev *pdev, void __iomem *vaddr, int wait_for_ready)#define BOARD_READY 1#define BOARD_NOT_READY 0
@@ -4179,7 +4179,7 @@ static int __devinit cciss_wait_for_board_state(struct pci_dev *pdev,return -ENODEV ; } -static int __devinit cciss_find_cfg_addrs (struct pci_dev *pdev, +static int cciss_find_cfg_addrs (struct pci_dev *pdev,void __iomem *vaddr,u32 *cfg_base_addr,u64 *cfg_base_addr_index,u64 *cfg_offset) {
@@ -4195,7 +4195,7 @@ static int __devinit cciss_find_cfg_addrs(struct pci_dev *pdev,return 0 ; } -static int __devinit cciss_find_cfgtables (ctlr_info_t *h) +static int cciss_find_cfgtables (ctlr_info_t *h) {u64 cfg_offset;u32 cfg_base_addr;
@@ -4224,7 +4224,7 @@ static int __devinit cciss_find_cfgtables(ctlr_info_t *h)return 0 ; } -static void __devinit cciss_get_max_perf_mode_cmds (struct ctlr_info *h) +static void cciss_get_max_perf_mode_cmds (struct ctlr_info *h) { h->max_commands =readl (&(h->cfgtable->MaxPerformantModeCommands));
@@ -4245,7 +4245,7 @@ static void __devinit cciss_get_max_perf_mode_cmds(struct ctlr_info *h)* max commands, max SG elements without chaining, and with chaining, * SG chain block size, etc. */ -static void __devinit cciss_find_board_params (ctlr_info_t *h) +static void cciss_find_board_params (ctlr_info_t *h) {cciss_get_max_perf_mode_cmds (h); h->nr_cmds = h->max_commands -4 - cciss_tape_cmds;
@@ -4304,7 +4304,7 @@ static inline void cciss_p600_dma_prefetch_quirk(ctlr_info_t *h)pci_write_config_dword (h->pdev,PCI_COMMAND_PARITY , dma_refetch); } -static int __devinit cciss_pci_init (ctlr_info_t *h) +static int cciss_pci_init (ctlr_info_t *h) {int prod_index, err;
@@ -4424,7 +4424,7 @@ static void free_hba(ctlr_info_t *h) }/* Send a message CDB to the firmware. */ -static __devinit int cciss_message (struct pci_dev *pdev,unsigned char opcode,unsigned char type) +static int cciss_message (struct pci_dev *pdev,unsigned char opcode,unsigned char type) { typedef struct { CommandListHeader_struct CommandHeader;
@@ -4571,13 +4571,13 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev,return 0 ; } -static __devinit void init_driver_version (char *driver_version,int len) +static void init_driver_version (char *driver_version,int len) {memset (driver_version,0 , len);strncpy (driver_version,"cciss " DRIVER_NAME , len -1 ); } -static __devinit int write_driver_ver_to_cfgtable ( +static int write_driver_ver_to_cfgtable (CfgTable_struct __iomem *cfgtable) {char *driver_version;
@@ -4594,7 +4594,7 @@ static __devinit int write_driver_ver_to_cfgtable(return 0 ; } -static __devinit void read_driver_ver_from_cfgtable ( +static void read_driver_ver_from_cfgtable (CfgTable_struct __iomem *cfgtable,unsigned char *driver_ver) {int i;
@@ -4603,7 +4603,7 @@ static __devinit void read_driver_ver_from_cfgtable( driver_ver[i] =readb (&cfgtable->driver_version[i]); } -static __devinit int controller_reset_failed ( +static int controller_reset_failed (CfgTable_struct __iomem *cfgtable) {
@@ -4627,7 +4627,7 @@ static __devinit int controller_reset_failed(/* This does a hard reset of the controller using PCI power management * states or using the doorbell register. */ -static __devinit int cciss_kdump_hard_reset_controller (struct pci_dev *pdev) +static int cciss_kdump_hard_reset_controller (struct pci_dev *pdev) {u64 cfg_offset;u32 cfg_base_addr;
@@ -4772,7 +4772,7 @@ unmap_vaddr:return rc; } -static __devinit int cciss_init_reset_devices (struct pci_dev *pdev) +static int cciss_init_reset_devices (struct pci_dev *pdev) {int rc, i;
@@ -4806,7 +4806,7 @@ static __devinit int cciss_init_reset_devices(struct pci_dev *pdev)return 0 ; } -static __devinit int cciss_allocate_cmd_pool (ctlr_info_t *h) +static int cciss_allocate_cmd_pool (ctlr_info_t *h) { h->cmd_pool_bits =kmalloc (BITS_TO_LONGS (h->nr_cmds) *sizeof (unsigned long ),GFP_KERNEL );
@@ -4825,7 +4825,7 @@ static __devinit int cciss_allocate_cmd_pool(ctlr_info_t *h)return 0 ; } -static __devinit int cciss_allocate_scatterlists (ctlr_info_t *h) +static int cciss_allocate_scatterlists (ctlr_info_t *h) {int i;
@@ -4893,7 +4893,7 @@ static int cciss_request_irq(ctlr_info_t *h,return -1 ; } -static int __devinit cciss_kdump_soft_reset (ctlr_info_t *h) +static int cciss_kdump_soft_reset (ctlr_info_t *h) {if (cciss_send_reset (h,CTLR_LUNID ,CCISS_RESET_TYPE_CONTROLLER )) {dev_warn (&h->pdev->dev,"Resetting array controller failed.\n" );
@@ -4952,7 +4952,7 @@ static void cciss_undo_allocations_after_kdump_soft_reset(ctlr_info_t *h)* stealing all these major device numbers. * returns the number of block devices registered. */ -static int __devinit cciss_init_one (struct pci_dev *pdev, +static int cciss_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {int i;
@@ -5207,7 +5207,7 @@ static void cciss_shutdown(struct pci_dev *pdev)free_irq (h->intr[h->intr_mode], h); } -static int __devinit cciss_enter_simple_mode (struct ctlr_info *h) +static int cciss_enter_simple_mode (struct ctlr_info *h) {u32 trans_support;
drivers/block/cpqarray.c +3 -3
@@ -388,7 +388,7 @@ static void __devexit cpqarray_remove_one_eisa (int i) }/* pdev is NULL for eisa */ -static int __devinit cpqarray_register_ctlr (int i,struct pci_dev *pdev) +static int cpqarray_register_ctlr (int i,struct pci_dev *pdev) {struct request_queue *q;int j;
@@ -505,7 +505,7 @@ Enomem4:return -1 ; } -static int __devinit cpqarray_init_one (struct pci_dev *pdev, +static int cpqarray_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {int i;
@@ -742,7 +742,7 @@ __setup("smart2=", cpqarray_setup);/* * Find an EISA controller's signature. Set up an hba if we find it. */ -static int __devinit cpqarray_eisa_detect (void ) +static int cpqarray_eisa_detect (void ) {int i=0 , j;__u32 board_id;
drivers/block/nvme.c +5 -5
@@ -975,7 +975,7 @@ static int queue_request_irq(struct nvme_dev *dev, struct nvme_queue *nvmeq, IRQF_DISABLED | IRQF_SHARED, name, nvmeq); } -static __devinit struct nvme_queue *nvme_create_queue (struct nvme_dev *dev, +static struct nvme_queue *nvme_create_queue (struct nvme_dev *dev,int qid,int cq_size,int vector) {int result;
@@ -1011,7 +1011,7 @@ static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev,return ERR_PTR (result); } -static int __devinit nvme_configure_admin_queue (struct nvme_dev *dev) +static int nvme_configure_admin_queue (struct nvme_dev *dev) {int result =0 ;u32 aqa;
@@ -1408,7 +1408,7 @@ static int set_queue_count(struct nvme_dev *dev, int count)return min (result &0xffff , result >>16 ) +1 ; } -static int __devinit nvme_setup_io_queues (struct nvme_dev *dev) +static int nvme_setup_io_queues (struct nvme_dev *dev) {int result, cpu, i, nr_io_queues, db_bar_size, q_depth;
@@ -1481,7 +1481,7 @@ static void nvme_free_queues(struct nvme_dev *dev)nvme_free_queue (dev, i); } -static int __devinit nvme_dev_add (struct nvme_dev *dev) +static int nvme_dev_add (struct nvme_dev *dev) {int res, nn, i;struct nvme_ns *ns, *next;
@@ -1619,7 +1619,7 @@ static void nvme_release_instance(struct nvme_dev *dev)spin_unlock (&dev_list_lock); } -static int __devinit nvme_probe (struct pci_dev *pdev, +static int nvme_probe (struct pci_dev *pdev,const struct pci_device_id *id) {int bars, result = -ENOMEM ;
drivers/block/ps3disk.c +1 -1
@@ -401,7 +401,7 @@ static unsigned long ps3disk_mask;static DEFINE_MUTEX (ps3disk_mask_mutex); -static int __devinit ps3disk_probe (struct ps3_system_bus_device *_dev) +static int ps3disk_probe (struct ps3_system_bus_device *_dev) {struct ps3_storage_device *dev =to_ps3_storage_device (&_dev->core);struct ps3disk_private *priv;
drivers/block/ps3vram.c +2 -2
@@ -536,7 +536,7 @@ static const struct file_operations ps3vram_proc_fops = { .release = single_release, }; -static void __devinit ps3vram_proc_init (struct ps3_system_bus_device *dev) +static void ps3vram_proc_init (struct ps3_system_bus_device *dev) {struct ps3vram_priv *priv =ps3_system_bus_get_drvdata (dev);struct proc_dir_entry *pde;
@@ -618,7 +618,7 @@ static void ps3vram_make_request(struct request_queue *q, struct bio *bio) }while (bio); } -static int __devinit ps3vram_probe (struct ps3_system_bus_device *dev) +static int ps3vram_probe (struct ps3_system_bus_device *dev) {struct ps3vram_priv *priv;int error, status;
drivers/block/sunvdc.c +3 -3
@@ -592,7 +592,7 @@ static int generic_request(struct vdc_port *port, u8 op, void *buf, int len)return err; } -static int __devinit vdc_alloc_tx_ring (struct vdc_port *port) +static int vdc_alloc_tx_ring (struct vdc_port *port) {struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_TX_RING ];unsigned long len, entry_size;
@@ -725,7 +725,7 @@ static struct vio_driver_ops vdc_vio_ops = { .handshake_complete = vdc_handshake_complete, }; -static void __devinit print_version (void ) +static void print_version (void ) {static int version_printed;
@@ -733,7 +733,7 @@ static void __devinit print_version(void)printk (KERN_INFO "%s" , version); } -static int __devinit vdc_port_probe (struct vio_dev *vdev, +static int vdc_port_probe (struct vio_dev *vdev,const struct vio_device_id *id) {struct mdesc_handle *hp;
drivers/block/swim.c +3 -3
@@ -788,7 +788,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)return get_disk (swd->unit[drive].disk); } -static int __devinit swim_add_floppy (struct swim_priv *swd, +static int swim_add_floppy (struct swim_priv *swd,enum drive_location location) {struct floppy_state *fs = &swd->unit[swd->floppy_count];
@@ -812,7 +812,7 @@ static int __devinit swim_add_floppy(struct swim_priv *swd,return 0 ; } -static int __devinit swim_floppy_init (struct swim_priv *swd) +static int swim_floppy_init (struct swim_priv *swd) {int err;int drive;
@@ -875,7 +875,7 @@ exit_put_disks:return err; } -static int __devinit swim_probe (struct platform_device *dev) +static int swim_probe (struct platform_device *dev) {struct resource *res;struct swim __iomem *swim_base;
drivers/block/swim3.c +1 -1
@@ -1194,7 +1194,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index)return rc; } -static int __devinit swim3_attach (struct macio_dev *mdev,const struct of_device_id *match) +static int swim3_attach (struct macio_dev *mdev,const struct of_device_id *match) {struct gendisk *disk;int index, rc;
drivers/block/umem.c +1 -1
@@ -789,7 +789,7 @@ static const struct block_device_operations mm_fops = { .revalidate_disk = mm_revalidate, }; -static int __devinit mm_pci_probe (struct pci_dev *dev, +static int mm_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) {int ret = -ENODEV ;
drivers/block/virtio_blk.c +2 -2
@@ -696,7 +696,7 @@ static const struct device_attribute dev_attr_cache_type_rw =__ATTR (cache_type,S_IRUGO |S_IWUSR , virtblk_cache_type_show, virtblk_cache_type_store); -static int __devinit virtblk_probe (struct virtio_device *vdev) +static int virtblk_probe (struct virtio_device *vdev) {struct virtio_blk *vblk;struct request_queue *q;
@@ -963,7 +963,7 @@ static unsigned int features[] = {/* * virtio_blk causes spurious section mismatch warning by -* simultaneously referring to a __devinit and a __devexit function. +* simultaneously referring to a and a __devexit function. * Use __refdata to avoid this warning. */ static struct virtio_driver __refdata virtio_blk = {
drivers/block/xsysace.c +3 -3
@@ -961,7 +961,7 @@ static const struct block_device_operations ace_fops = {/* -------------------------------------------------------------------- * SystemACE device setup/teardown code */ -static int __devinit ace_setup (struct ace_device *ace) +static int ace_setup (struct ace_device *ace) {u16 version;u16 val;
@@ -1092,7 +1092,7 @@ static void __devexit ace_teardown(struct ace_device *ace)iounmap (ace->baseaddr); } -static int __devinit +static int ace_alloc (struct device *dev,int id,resource_size_t physaddr,int irq,int bus_width) {
@@ -1151,7 +1151,7 @@ static void __devexit ace_free(struct device *dev)* Platform Bus Support */ -static int __devinit ace_probe (struct platform_device *dev) +static int ace_probe (struct platform_device *dev) {resource_size_t physaddr =0 ;int bus_width =ACE_BUS_WIDTH_16 ;/* FIXME: should not be hard coded */
Signature · 1 line
1.8.0
PATCH 249/493 drivers: connector: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Evgeniy Polyakov <[email protected]>
--- drivers/connector/connector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/connector/connector.c +1 -1
@@ -256,7 +256,7 @@ static struct cn_dev cdev = { .input = cn_rx_skb, }; -static int __devinit cn_init (void ) +static int cn_init (void ) {struct cn_dev *dev = &cdev;struct netlink_kernel_cfg cfg = {
Signature · 1 line
1.8.0
PATCH 250/493 cpufreq: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
--- drivers/cpufreq/cpufreq-cpu0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cpufreq-cpu0.c +1 -1
@@ -174,7 +174,7 @@ static struct cpufreq_driver cpu0_cpufreq_driver = { .attr = cpu0_cpufreq_attr, }; -static int __devinit cpu0_cpufreq_driver_init (void ) +static int cpu0_cpufreq_driver_init (void ) {struct device_node *np;int ret;
Signature · 1 line
1.8.0
Rafael J. Wysocki
AppliedRe: [PATCH 250/493] cpufreq: remove use of __devinit
Quoted 2 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.
Applied to the linux-next branch of the linux-pm.git tree as v3.8 material.
Thanks,
Rafael
Quoted 22 lines
Signed-off-by Bill Pemberton <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>--- drivers/cpufreq/cpufreq-cpu0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/cpufreq/cpufreq-cpu0.c +1
-1@@ -174,7 +174,7 @@ static struct cpufreq_driver cpu0_cpufreq_driver = { .attr = cpu0_cpufreq_attr, }; -static int __devinit cpu0_cpufreq_driver_init (void ) +static int cpu0_cpufreq_driver_init (void ) {struct device_node *np;int ret;
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
PATCH 253/493 hwspinlock: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Ohad Ben-Cohen <[email protected]>
Cc Srinidhi Kasagar <[email protected]>
Cc Linus Walleij <[email protected]>
Cc linux-omap at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
--- drivers/hwspinlock/omap_hwspinlock.c | 2 +- drivers/hwspinlock/u8500_hsem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/hwspinlock/omap_hwspinlock.c +1 -1
@@ -78,7 +78,7 @@ static const struct hwspinlock_ops omap_hwspinlock_ops = { .relax = omap_hwspinlock_relax, }; -static int __devinit omap_hwspinlock_probe (struct platform_device *pdev) +static int omap_hwspinlock_probe (struct platform_device *pdev) {struct hwspinlock_pdata *pdata = pdev->dev.platform_data;struct hwspinlock_device *bank;
drivers/hwspinlock/u8500_hsem.c +1 -1
@@ -91,7 +91,7 @@ static const struct hwspinlock_ops u8500_hwspinlock_ops = { .relax = u8500_hsem_relax, }; -static int __devinit u8500_hsem_probe (struct platform_device *pdev) +static int u8500_hsem_probe (struct platform_device *pdev) {struct hwspinlock_pdata *pdata = pdev->dev.platform_data;struct hwspinlock_device *bank;
Signature · 1 line
1.8.0
PATCH 253/493 hwspinlock: remove use of __devinit
Quoted 9 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.Signed-off-by Bill Pemberton <[email protected]>Cc Ohad Ben-Cohen <[email protected]>Cc Srinidhi Kasagar <[email protected]>Cc Linus Walleij <[email protected]>Cc linux-omap at vger.kernel.orgCc linux-arm-kernel at lists.infradead.org
Acked-by Linus Walleij <[email protected]>
Yours,
Linus Walleij
PATCH 260/493 ALSA: usb-audio: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Daniel Mack <[email protected]>
--- sound/usb/6fire/chip.c | 2 +- sound/usb/6fire/comm.c | 2 +- sound/usb/6fire/comm.h | 2 +- sound/usb/6fire/control.c | 2 +- sound/usb/6fire/control.h | 2 +- sound/usb/6fire/firmware.h | 2 +- sound/usb/6fire/midi.c | 2 +- sound/usb/6fire/midi.h | 2 +- sound/usb/6fire/pcm.c | 4 ++-- sound/usb/6fire/pcm.h | 2 +- sound/usb/caiaq/control.c | 4 ++-- sound/usb/caiaq/device.c | 6 +++--- 12 files changed, 16 insertions(+), 16 deletions(-)
sound/usb/6fire/chip.c +1 -1
@@ -82,7 +82,7 @@ static void usb6fire_chip_destroy(struct sfire_chip *chip) } } -static int __devinit usb6fire_chip_probe (struct usb_interface *intf, +static int usb6fire_chip_probe (struct usb_interface *intf,const struct usb_device_id *usb_id) {int ret;
sound/usb/6fire/comm.c +1 -1
@@ -125,7 +125,7 @@ static int usb6fire_comm_write16(struct comm_runtime *rt, u8 request,return usb6fire_comm_send_buffer (buffer, rt->chip->dev); } -int __devinit usb6fire_comm_init (struct sfire_chip *chip) +int usb6fire_comm_init (struct sfire_chip *chip) {struct comm_runtime *rt =kzalloc (sizeof (struct comm_runtime ),GFP_KERNEL );
sound/usb/6fire/comm.h +1 -1
@@ -36,7 +36,7 @@ struct comm_runtime { u8 vh, u8 vl); }; -int __devinit usb6fire_comm_init (struct sfire_chip *chip); +int usb6fire_comm_init (struct sfire_chip *chip);void usb6fire_comm_abort (struct sfire_chip *chip);void usb6fire_comm_destroy (struct sfire_chip *chip);#endif /* USB6FIRE_COMM_H */
sound/usb/6fire/control.c +1 -1
@@ -561,7 +561,7 @@ static int usb6fire_control_add_virtual(return 0 ; } -int __devinit usb6fire_control_init (struct sfire_chip *chip) +int usb6fire_control_init (struct sfire_chip *chip) {int i;int ret;
sound/usb/6fire/control.h +1 -1
@@ -50,7 +50,7 @@ struct control_runtime { u8 ivol_updated; }; -int __devinit usb6fire_control_init (struct sfire_chip *chip); +int usb6fire_control_init (struct sfire_chip *chip);void usb6fire_control_abort (struct sfire_chip *chip);void usb6fire_control_destroy (struct sfire_chip *chip);#endif /* USB6FIRE_CONTROL_H */
sound/usb/6fire/firmware.h +1 -1
@@ -22,6 +22,6 @@ enum /* firmware state of device */FW_NOT_READY =1 }; -int __devinit usb6fire_fw_init (struct usb_interface *intf); +int usb6fire_fw_init (struct usb_interface *intf);#endif /* USB6FIRE_FIRMWARE_H */
sound/usb/6fire/midi.c +1 -1
@@ -146,7 +146,7 @@ static struct snd_rawmidi_ops in_ops = { .trigger = usb6fire_midi_in_trigger }; -int __devinit usb6fire_midi_init (struct sfire_chip *chip) +int usb6fire_midi_init (struct sfire_chip *chip) {int ret; struct midi_runtime *rt = kzalloc(sizeof(struct midi_runtime),
sound/usb/6fire/midi.h +1 -1
@@ -38,7 +38,7 @@ struct midi_runtime { void (*in_received)(struct midi_runtime *rt, u8 *data, int length); }; -int __devinit usb6fire_midi_init (struct sfire_chip *chip); +int usb6fire_midi_init (struct sfire_chip *chip);void usb6fire_midi_abort (struct sfire_chip *chip);void usb6fire_midi_destroy (struct sfire_chip *chip);#endif /* USB6FIRE_MIDI_H */
sound/usb/6fire/pcm.c +2 -2
@@ -559,7 +559,7 @@ static struct snd_pcm_ops pcm_ops = { .pointer = usb6fire_pcm_pointer, }; -static void __devinit usb6fire_pcm_init_urb (struct pcm_urb *urb, +static void usb6fire_pcm_init_urb (struct pcm_urb *urb,struct sfire_chip *chip,bool in,int ep,void (*handler)(struct urb *)) {
@@ -578,7 +578,7 @@ static void __devinit usb6fire_pcm_init_urb(struct pcm_urb *urb, urb->instance.number_of_packets =PCM_N_PACKETS_PER_URB ; } -int __devinit usb6fire_pcm_init (struct sfire_chip *chip) +int usb6fire_pcm_init (struct sfire_chip *chip) {int i;int ret;
sound/usb/6fire/pcm.h +1 -1
@@ -69,7 +69,7 @@ struct pcm_runtime { bool stream_wait_cond; }; -int __devinit usb6fire_pcm_init (struct sfire_chip *chip); +int usb6fire_pcm_init (struct sfire_chip *chip);void usb6fire_pcm_abort (struct sfire_chip *chip);void usb6fire_pcm_destroy (struct sfire_chip *chip);#endif /* USB6FIRE_PCM_H */
sound/usb/caiaq/control.c +2 -2
@@ -489,7 +489,7 @@ static struct caiaq_controller kontrols4_controller[] = { { "LED: FX2: Mode", 133 | CNT_INTVAL }, }; -static int __devinit add_controls (struct caiaq_controller *c,int num, +static int add_controls (struct caiaq_controller *c,int num,struct snd_usb_caiaqdev *dev) {int i, ret;
@@ -507,7 +507,7 @@ static int __devinit add_controls(struct caiaq_controller *c, int num,return 0 ; } -int __devinit snd_usb_caiaq_control_init (struct snd_usb_caiaqdev *dev) +int snd_usb_caiaq_control_init (struct snd_usb_caiaqdev *dev) {int ret =0 ;
sound/usb/caiaq/device.c +3 -3
@@ -289,7 +289,7 @@ int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev, tmp, sizeof(tmp)); } -static void __devinit setup_card (struct snd_usb_caiaqdev *dev) +static void setup_card (struct snd_usb_caiaqdev *dev) {int ret;char val[4 ];
@@ -407,7 +407,7 @@ static int create_card(struct usb_device *usb_dev,return 0 ; } -static int __devinit init_card (struct snd_usb_caiaqdev *dev) +static int init_card (struct snd_usb_caiaqdev *dev) {char *c, usbpath[32 ];struct usb_device *usb_dev = dev->chip.dev;
@@ -481,7 +481,7 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)return 0 ; } -static int __devinit snd_probe (struct usb_interface *intf, +static int snd_probe (struct usb_interface *intf,const struct usb_device_id *id) {int ret;
Signature · 1 line
1.8.0
PATCH 261/493 sound: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Russell King <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Eric Miao <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Clemens Ladisch <[email protected]>
Cc Thibaut Varene <[email protected]>
Cc Jaya Kumar <[email protected]>
Cc Geoff Levand <[email protected]>
Cc M R Swami Reddy <[email protected]>
Cc Vishwas A Deshpande <[email protected]>
Cc Peter Ujfalusi <[email protected]>
Cc Jarkko Nikula <[email protected]>
Cc Philipp Zabel <[email protected]>
Cc Paul Parsons <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Kukjin Kim <[email protected]>
--- sound/arm/aaci.c | 10 +++---- sound/arm/pxa2xx-ac97-lib.c | 2 +- sound/arm/pxa2xx-ac97.c | 2 +- sound/atmel/abdac.c | 4 +-- sound/atmel/ac97c.c | 4 +-- sound/drivers/aloop.c | 8 +++--- sound/drivers/dummy.c | 8 +++--- sound/drivers/ml403-ac97cr.c | 14 ++++------ sound/drivers/mpu401/mpu401.c | 6 ++--- sound/drivers/mtpav.c | 8 +++--- sound/drivers/mts64.c | 16 ++++++------ sound/drivers/pcsp/pcsp.c | 8 +++--- sound/drivers/pcsp/pcsp_input.c | 2 +- sound/drivers/pcsp/pcsp_input.h | 2 +- sound/drivers/pcsp/pcsp_lib.c | 2 +- sound/drivers/pcsp/pcsp_mixer.c | 4 +-- sound/drivers/portman2x4.c | 10 +++---- sound/drivers/serial-u16550.c | 10 +++---- sound/drivers/virmidi.c | 2 +- sound/firewire/speakers.c | 4 +-- sound/isa/ad1816a/ad1816a.c | 6 ++--- sound/isa/ad1816a/ad1816a_lib.c | 12 ++++----- sound/isa/ad1848/ad1848.c | 4 +-- sound/isa/adlib.c | 4 +-- sound/isa/als100.c | 6 ++--- sound/isa/azt2320.c | 10 +++---- sound/isa/cmi8328.c | 4 +-- sound/isa/cmi8330.c | 16 ++++++------ sound/isa/cs423x/cs4231.c | 4 +-- sound/isa/cs423x/cs4236.c | 20 +++++++------- sound/isa/es1688/es1688.c | 12 ++++----- sound/isa/es18xx.c | 36 +++++++++++++------------- sound/isa/galaxy/galaxy.c | 22 ++++++++-------- sound/isa/gus/gusclassic.c | 8 +++--- sound/isa/gus/gusextreme.c | 12 ++++----- sound/isa/gus/gusmax.c | 10 +++---- sound/isa/gus/interwave.c | 26 +++++++++---------- sound/isa/msnd/msnd.h | 2 +- sound/isa/msnd/msnd_pinnacle.c | 30 ++++++++++----------- sound/isa/msnd/msnd_pinnacle_mixer.c | 2 +- sound/isa/opl3sa2.c | 16 ++++++------ sound/isa/opti9xx/miro.c | 26 +++++++++---------- sound/isa/opti9xx/opti92x-ad1848.c | 18 ++++++------- sound/isa/sb/emu8000.c | 33 ++++++++--------------- sound/isa/sb/jazz16.c | 10 +++---- sound/isa/sb/sb16.c | 12 ++++----- sound/isa/sb/sb8.c | 4 +-- sound/isa/sc6000.c | 24 ++++++++--------- sound/isa/sscape.c | 18 ++++++------- sound/isa/wavefront/wavefront.c | 21 ++++++--------- sound/isa/wavefront/wavefront_fx.c | 3 +-- sound/isa/wavefront/wavefront_midi.c | 3 +-- sound/isa/wavefront/wavefront_synth.c | 21 +++++---------- sound/mips/au1x00.c | 6 ++--- sound/mips/hal2.c | 6 ++--- sound/mips/sgio2audio.c | 8 +++--- sound/oss/kahlua.c | 4 +-- sound/oss/swarm_cs4297a.c | 2 +- sound/parisc/harmony.c | 12 +++------ sound/pci/ad1889.c | 21 +++++---------- sound/pci/ak4531_codec.c | 5 ++-- sound/pci/ali5451/ali5451.c | 14 +++++----- sound/pci/als300.c | 6 ++--- sound/pci/als4000.c | 6 ++--- sound/pci/asihpi/asihpi.c | 28 ++++++++++---------- sound/pci/asihpi/hpioctl.c | 2 +- sound/pci/asihpi/hpioctl.h | 2 +- sound/pci/atiixp.c | 14 +++++----- sound/pci/atiixp_modem.c | 10 +++---- sound/pci/au88x0/au88x0.c | 8 +++--- sound/pci/au88x0/au88x0_a3d.c | 4 +-- sound/pci/au88x0/au88x0_core.c | 2 +- sound/pci/au88x0/au88x0_eq.c | 2 +- sound/pci/au88x0/au88x0_game.c | 2 +- sound/pci/au88x0/au88x0_mixer.c | 2 +- sound/pci/au88x0/au88x0_mpu401.c | 2 +- sound/pci/au88x0/au88x0_pcm.c | 2 +- sound/pci/aw2/aw2-alsa.c | 12 ++++----- sound/pci/azt3328.c | 21 +++++---------- sound/pci/bt87x.c | 8 +++--- sound/pci/ca0106/ca0106_main.c | 8 +++--- sound/pci/ca0106/ca0106_mixer.c | 13 +++++----- sound/pci/ca0106/ca0106_proc.c | 2 +- sound/pci/ca0106/ca_midi.c | 2 +- sound/pci/cmipci.c | 20 +++++++------- sound/pci/cs4281.c | 14 +++++----- sound/pci/cs46xx/cs46xx.c | 2 +- sound/pci/cs46xx/cs46xx_lib.c | 24 ++++++++--------- sound/pci/cs5530.c | 6 ++--- sound/pci/cs5535audio/cs5535audio.c | 6 ++--- sound/pci/cs5535audio/cs5535audio.h | 6 ++--- sound/pci/cs5535audio/cs5535audio_olpc.c | 4 +-- sound/pci/cs5535audio/cs5535audio_pcm.c | 2 +- sound/pci/ctxfi/ctatc.c | 8 +++--- sound/pci/ctxfi/ctatc.h | 4 +-- sound/pci/ctxfi/cthardware.c | 2 +- sound/pci/ctxfi/cthw20k1.c | 2 +- sound/pci/ctxfi/cthw20k2.c | 2 +- sound/pci/ctxfi/xfi.c | 3 +-- sound/pci/echoaudio/echoaudio.c | 6 ++--- sound/pci/echoaudio/echoaudio.h | 2 +- sound/pci/echoaudio/midi.c | 2 +- sound/pci/emu10k1/emu10k1.c | 2 +- sound/pci/emu10k1/emu10k1_main.c | 4 +-- sound/pci/emu10k1/emu10k1x.c | 14 +++++----- sound/pci/emu10k1/emufx.c | 28 +++++++++----------- sound/pci/emu10k1/emumixer.c | 2 +- sound/pci/emu10k1/emumpu401.c | 6 ++--- sound/pci/emu10k1/emupcm.c | 8 +++--- sound/pci/emu10k1/emuproc.c | 2 +- sound/pci/emu10k1/p16v.c | 6 ++--- sound/pci/emu10k1/timer.c | 2 +- sound/pci/ens1370.c | 20 +++++++------- sound/pci/es1938.c | 10 +++---- sound/pci/es1968.c | 19 ++++++-------- sound/pci/fm801.c | 8 +++--- sound/pci/hda/hda_intel.c | 30 ++++++++++----------- sound/pci/ice1712/amp.c | 4 +-- sound/pci/ice1712/aureon.c | 4 +-- sound/pci/ice1712/delta.c | 4 +-- sound/pci/ice1712/ews.c | 4 +-- sound/pci/ice1712/hoontech.c | 20 +++++++------- sound/pci/ice1712/ice1712.c | 28 ++++++++++---------- sound/pci/ice1712/ice1724.c | 20 +++++++------- sound/pci/ice1712/juli.c | 8 +++--- sound/pci/ice1712/maya44.c | 6 ++--- sound/pci/ice1712/phase.c | 8 +++--- sound/pci/ice1712/pontis.c | 4 +-- sound/pci/ice1712/prodigy192.c | 4 +-- sound/pci/ice1712/prodigy_hifi.c | 8 +++--- sound/pci/ice1712/psc724.c | 4 +-- sound/pci/ice1712/quartet.c | 8 +++--- sound/pci/ice1712/revo.c | 6 ++--- sound/pci/ice1712/se.c | 12 ++++----- sound/pci/ice1712/vt1720_mobo.c | 4 +-- sound/pci/ice1712/wtm.c | 4 +-- sound/pci/intel8x0.c | 22 ++++++++-------- sound/pci/intel8x0m.c | 12 ++++----- sound/pci/korg1212/korg1212.c | 7 +++-- sound/pci/lola/lola.c | 6 ++--- sound/pci/lola/lola_clock.c | 2 +- sound/pci/lola/lola_mixer.c | 16 ++++++------ sound/pci/lola/lola_pcm.c | 4 +-- sound/pci/lola/lola_proc.c | 2 +- sound/pci/lx6464es/lx6464es.c | 18 ++++++------- sound/pci/lx6464es/lx_core.c | 2 +- sound/pci/lx6464es/lx_core.h | 2 +- sound/pci/maestro3.c | 15 +++++------ sound/pci/mixart/mixart.c | 6 ++--- sound/pci/nm256/nm256.c | 14 ++++------ sound/pci/oxygen/oxygen.c | 4 +-- sound/pci/oxygen/virtuoso.c | 4 +-- sound/pci/oxygen/xonar_cs43xx.c | 2 +- sound/pci/oxygen/xonar_pcm179x.c | 2 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/pci/pcxhr/pcxhr.c | 6 ++--- sound/pci/riptide/riptide.c | 16 +++++------- sound/pci/rme32.c | 7 +++-- sound/pci/rme96.c | 10 +++---- sound/pci/rme9652/hdsp.c | 6 ++--- sound/pci/rme9652/hdspm.c | 20 +++++++------- sound/pci/rme9652/rme9652.c | 10 +++---- sound/pci/sis7019.c | 8 +++--- sound/pci/sonicvibes.c | 14 +++++----- sound/pci/trident/trident.c | 2 +- sound/pci/trident/trident_main.c | 18 ++++++------- sound/pci/via82xx.c | 22 ++++++++-------- sound/pci/via82xx_modem.c | 10 +++---- sound/pci/vx222/vx222.c | 4 +-- sound/pci/ymfpci/ymfpci.c | 4 +-- sound/pci/ymfpci/ymfpci_main.c | 20 +++++++------- sound/ppc/awacs.c | 3 +-- sound/ppc/beep.c | 2 +- sound/ppc/burgundy.c | 2 +- sound/ppc/daca.c | 2 +- sound/ppc/keywest.c | 4 +-- sound/ppc/pmac.c | 10 +++---- sound/ppc/powermac.c | 2 +- sound/ppc/snd_ps3.c | 12 ++++----- sound/ppc/tumbler.c | 4 +-- sound/sh/aica.c | 4 +-- sound/sh/sh_dac_audio.c | 6 ++--- sound/soc/atmel/atmel-pcm.c | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 2 +- sound/soc/atmel/sam9g20_wm8731.c | 2 +- sound/soc/au1x/ac97c.c | 2 +- sound/soc/au1x/db1000.c | 2 +- sound/soc/au1x/db1200.c | 2 +- sound/soc/au1x/dbdma2.c | 2 +- sound/soc/au1x/dma.c | 2 +- sound/soc/au1x/i2sc.c | 2 +- sound/soc/au1x/psc-ac97.c | 2 +- sound/soc/au1x/psc-i2s.c | 2 +- sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +- sound/soc/blackfin/bf5xx-ac97.c | 2 +- sound/soc/blackfin/bf5xx-ad1836.c | 2 +- sound/soc/blackfin/bf5xx-i2s-pcm.c | 2 +- sound/soc/blackfin/bf5xx-i2s.c | 2 +- sound/soc/blackfin/bf5xx-tdm-pcm.c | 2 +- sound/soc/blackfin/bf5xx-tdm.c | 2 +- sound/soc/blackfin/bf6xx-i2s.c | 2 +- sound/soc/cirrus/edb93xx.c | 2 +- sound/soc/cirrus/ep93xx-ac97.c | 2 +- sound/soc/cirrus/ep93xx-pcm.c | 2 +- sound/soc/cirrus/simone.c | 2 +- sound/soc/cirrus/snappercl15.c | 2 +- sound/soc/codecs/88pm860x-codec.c | 2 +- sound/soc/codecs/ab8500-codec.c | 2 +- sound/soc/codecs/ac97.c | 2 +- sound/soc/codecs/ad1836.c | 2 +- sound/soc/codecs/ad193x.c | 4 +-- sound/soc/codecs/ad1980.c | 2 +- sound/soc/codecs/adau1373.c | 2 +- sound/soc/codecs/adau1701.c | 2 +- sound/soc/codecs/adav80x.c | 6 ++--- sound/soc/codecs/ads117x.c | 2 +- sound/soc/codecs/ak4535.c | 2 +- sound/soc/codecs/ak4641.c | 2 +- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/ak4671.c | 2 +- sound/soc/codecs/alc5623.c | 2 +- sound/soc/codecs/alc5632.c | 2 +- sound/soc/codecs/cs4271.c | 4 +-- sound/soc/codecs/cs42l73.c | 2 +- sound/soc/codecs/da7210.c | 4 +-- sound/soc/codecs/da732x.c | 2 +- sound/soc/codecs/da9055.c | 2 +- sound/soc/codecs/dfbmcs320.c | 2 +- sound/soc/codecs/dmic.c | 2 +- sound/soc/codecs/isabelle.c | 2 +- sound/soc/codecs/jz4740.c | 2 +- sound/soc/codecs/lm4857.c | 2 +- sound/soc/codecs/lm49453.c | 2 +- sound/soc/codecs/max9768.c | 2 +- sound/soc/codecs/max9850.c | 2 +- sound/soc/codecs/max9877.c | 2 +- sound/soc/codecs/ml26124.c | 2 +- sound/soc/codecs/omap-hdmi.c | 2 +- sound/soc/codecs/pcm3008.c | 2 +- sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/si476x.c | 2 +- sound/soc/codecs/sn95031.c | 2 +- sound/soc/codecs/ssm2602.c | 4 +-- sound/soc/codecs/sta32x.c | 2 +- sound/soc/codecs/sta529.c | 2 +- sound/soc/codecs/stac9766.c | 2 +- sound/soc/codecs/tlv320aic32x4.c | 2 +- sound/soc/codecs/tlv320dac33.c | 2 +- sound/soc/codecs/tpa6130a2.c | 2 +- sound/soc/codecs/twl4030.c | 2 +- sound/soc/codecs/twl6040.c | 2 +- sound/soc/codecs/uda134x.c | 2 +- sound/soc/codecs/uda1380.c | 2 +- sound/soc/codecs/wl1273.c | 2 +- sound/soc/codecs/wm0010.c | 2 +- sound/soc/codecs/wm1250-ev1.c | 4 +-- sound/soc/codecs/wm2000.c | 2 +- sound/soc/codecs/wm2200.c | 2 +- sound/soc/codecs/wm5100.c | 2 +- sound/soc/codecs/wm5102.c | 2 +- sound/soc/codecs/wm5110.c | 2 +- sound/soc/codecs/wm8350.c | 2 +- sound/soc/codecs/wm8400.c | 2 +- sound/soc/codecs/wm8510.c | 4 +-- sound/soc/codecs/wm8523.c | 2 +- sound/soc/codecs/wm8711.c | 4 +-- sound/soc/codecs/wm8727.c | 2 +- sound/soc/codecs/wm8728.c | 4 +-- sound/soc/codecs/wm8731.c | 4 +-- sound/soc/codecs/wm8737.c | 4 +-- sound/soc/codecs/wm8741.c | 2 +- sound/soc/codecs/wm8750.c | 4 +-- sound/soc/codecs/wm8753.c | 4 +-- sound/soc/codecs/wm8770.c | 2 +- sound/soc/codecs/wm8776.c | 4 +-- sound/soc/codecs/wm8782.c | 2 +- sound/soc/codecs/wm8804.c | 4 +-- sound/soc/codecs/wm8900.c | 4 +-- sound/soc/codecs/wm8903.c | 2 +- sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm8940.c | 2 +- sound/soc/codecs/wm8955.c | 2 +- sound/soc/codecs/wm8960.c | 2 +- sound/soc/codecs/wm8961.c | 2 +- sound/soc/codecs/wm8962.c | 2 +- sound/soc/codecs/wm8971.c | 2 +- sound/soc/codecs/wm8974.c | 2 +- sound/soc/codecs/wm8978.c | 2 +- sound/soc/codecs/wm8983.c | 4 +-- sound/soc/codecs/wm8985.c | 4 +-- sound/soc/codecs/wm8988.c | 4 +-- sound/soc/codecs/wm8990.c | 2 +- sound/soc/codecs/wm8991.c | 2 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm8994.c | 2 +- sound/soc/codecs/wm8995.c | 4 +-- sound/soc/codecs/wm8996.c | 2 +- sound/soc/codecs/wm9081.c | 2 +- sound/soc/codecs/wm9705.c | 2 +- sound/soc/codecs/wm9712.c | 2 +- sound/soc/codecs/wm9713.c | 2 +- sound/soc/fsl/eukrea-tlv320.c | 2 +- sound/soc/fsl/fsl_dma.c | 2 +- sound/soc/fsl/fsl_ssi.c | 2 +- sound/soc/fsl/imx-audmux.c | 2 +- sound/soc/fsl/imx-mc13783.c | 2 +- sound/soc/fsl/imx-pcm-dma.c | 2 +- sound/soc/fsl/imx-pcm-fiq.c | 2 +- sound/soc/fsl/imx-sgtl5000.c | 2 +- sound/soc/fsl/mpc5200_psc_ac97.c | 2 +- sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- sound/soc/fsl/mx27vis-aic32x4.c | 2 +- sound/soc/jz4740/jz4740-i2s.c | 2 +- sound/soc/jz4740/jz4740-pcm.c | 2 +- sound/soc/jz4740/qi_lb60.c | 2 +- sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- sound/soc/kirkwood/kirkwood-openrd.c | 2 +- sound/soc/kirkwood/kirkwood-t5325.c | 2 +- sound/soc/mid-x86/mfld_machine.c | 2 +- sound/soc/mxs/mxs-pcm.c | 2 +- sound/soc/mxs/mxs-saif.c | 2 +- sound/soc/mxs/mxs-sgtl5000.c | 4 +-- sound/soc/nuc900/nuc900-ac97.c | 2 +- sound/soc/nuc900/nuc900-pcm.c | 2 +- sound/soc/omap/ams-delta.c | 2 +- sound/soc/omap/mcbsp.c | 4 +-- sound/soc/omap/mcbsp.h | 2 +- sound/soc/omap/omap-abe-twl6040.c | 2 +- sound/soc/omap/omap-dmic.c | 2 +- sound/soc/omap/omap-hdmi-card.c | 2 +- sound/soc/omap/omap-hdmi.c | 2 +- sound/soc/omap/omap-mcbsp.c | 2 +- sound/soc/omap/omap-mcpdm.c | 2 +- sound/soc/omap/omap-pcm.c | 2 +- sound/soc/omap/omap-twl4030.c | 2 +- sound/soc/pxa/brownstone.c | 2 +- sound/soc/pxa/corgi.c | 2 +- sound/soc/pxa/e740_wm9705.c | 2 +- sound/soc/pxa/e750_wm9705.c | 2 +- sound/soc/pxa/e800_wm9712.c | 2 +- sound/soc/pxa/hx4700.c | 2 +- sound/soc/pxa/imote2.c | 2 +- sound/soc/pxa/mioa701_wm9713.c | 2 +- sound/soc/pxa/mmp-pcm.c | 2 +- sound/soc/pxa/mmp-sspa.c | 2 +- sound/soc/pxa/poodle.c | 2 +- sound/soc/pxa/pxa-ssp.c | 2 +- sound/soc/pxa/pxa2xx-ac97.c | 4 +-- sound/soc/pxa/pxa2xx-pcm.c | 2 +- sound/soc/pxa/tosa.c | 2 +- sound/soc/pxa/ttc-dkb.c | 2 +- sound/soc/s6000/s6000-i2s.c | 2 +- sound/soc/s6000/s6000-pcm.c | 2 +- sound/soc/samsung/ac97.c | 2 +- sound/soc/samsung/bells.c | 2 +- sound/soc/samsung/dma.c | 2 +- sound/soc/samsung/i2s.c | 5 ++-- sound/soc/samsung/idma.c | 2 +- sound/soc/samsung/littlemill.c | 2 +- sound/soc/samsung/lowland.c | 2 +- sound/soc/samsung/pcm.c | 2 +- sound/soc/samsung/s3c2412-i2s.c | 2 +- sound/soc/samsung/s3c24xx-i2s.c | 2 +- sound/soc/samsung/s3c24xx_simtec.c | 2 +- sound/soc/samsung/s3c24xx_simtec_hermes.c | 2 +- sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 2 +- sound/soc/samsung/smdk_wm8580pcm.c | 2 +- sound/soc/samsung/smdk_wm8994.c | 2 +- sound/soc/samsung/smdk_wm8994pcm.c | 2 +- sound/soc/samsung/spdif.c | 2 +- sound/soc/samsung/speyside.c | 2 +- sound/soc/samsung/tobermory.c | 2 +- sound/soc/sh/dma-sh7760.c | 2 +- sound/soc/sh/hac.c | 2 +- sound/soc/sh/siu_dai.c | 2 +- sound/soc/sh/ssi.c | 2 +- sound/soc/soc-utils.c | 2 +- sound/soc/spear/spear_pcm.c | 2 +- sound/soc/tegra/tegra20_das.c | 2 +- sound/soc/tegra/tegra20_i2s.c | 2 +- sound/soc/tegra/tegra20_spdif.c | 2 +- sound/soc/tegra/tegra30_ahub.c | 2 +- sound/soc/tegra/tegra30_i2s.c | 2 +- sound/soc/tegra/tegra_alc5632.c | 2 +- sound/soc/tegra/tegra_pcm.c | 2 +- sound/soc/tegra/tegra_wm8753.c | 2 +- sound/soc/tegra/tegra_wm8903.c | 2 +- sound/soc/tegra/trimslice.c | 2 +- sound/soc/txx9/txx9aclc-ac97.c | 2 +- sound/soc/txx9/txx9aclc.c | 2 +- sound/soc/ux500/mop500.c | 4 +-- sound/soc/ux500/ux500_msp_dai.c | 2 +- sound/soc/ux500/ux500_pcm.c | 2 +- sound/sparc/amd7930.c | 8 +++--- sound/sparc/cs4231.c | 24 ++++++++--------- sound/sparc/dbri.c | 18 ++++++------- sound/spi/at73c213.c | 12 ++++----- 398 files changed, 1042 insertions(+), 1120 deletions(-)
sound/arm/aaci.c +5 -5
@@ -832,7 +832,7 @@ static struct snd_ac97_bus_ops aaci_bus_ops = { .read = aaci_ac97_read, }; -static int __devinit aaci_probe_ac97 (struct aaci *aaci) +static int aaci_probe_ac97 (struct aaci *aaci) {struct snd_ac97_template ac97_template;struct snd_ac97_bus *ac97_bus;
@@ -893,7 +893,7 @@ static void aaci_free_card(struct snd_card *card)iounmap (aaci->base); } -static struct aaci *__devinit aaci_init_card (struct amba_device *dev) +static struct aaci *aaci_init_card (struct amba_device *dev) {struct aaci *aaci;struct snd_card *card;
@@ -926,7 +926,7 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)return aaci; } -static int __devinit aaci_init_pcm (struct aaci *aaci) +static int aaci_init_pcm (struct aaci *aaci) {struct snd_pcm *pcm;int ret;
@@ -948,7 +948,7 @@ static int __devinit aaci_init_pcm(struct aaci *aaci)return ret; } -static unsigned int __devinit aaci_size_fifo (struct aaci *aaci) +static unsigned int aaci_size_fifo (struct aaci *aaci) {struct aaci_runtime *aacirun = &aaci->playback;int i;
@@ -984,7 +984,7 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)return i; } -static int __devinit aaci_probe (struct amba_device *dev, +static int aaci_probe (struct amba_device *dev,const struct amba_id *id) {struct aaci *aaci;
sound/arm/pxa2xx-ac97-lib.c +1 -1
@@ -314,7 +314,7 @@ int pxa2xx_ac97_hw_resume(void)EXPORT_SYMBOL_GPL (pxa2xx_ac97_hw_resume);#endif -int __devinit pxa2xx_ac97_hw_probe (struct platform_device *dev) +int pxa2xx_ac97_hw_probe (struct platform_device *dev) {int ret;pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;
sound/arm/pxa2xx-ac97.c +1 -1
@@ -163,7 +163,7 @@ static int pxa2xx_ac97_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);#endif -static int __devinit pxa2xx_ac97_probe (struct platform_device *dev) +static int pxa2xx_ac97_probe (struct platform_device *dev) {struct snd_card *card;struct snd_ac97_bus *ac97_bus;
sound/atmel/abdac.c +2 -2
@@ -309,7 +309,7 @@ static struct snd_pcm_ops atmel_abdac_ops = { .pointer = atmel_abdac_pointer, }; -static int __devinit atmel_abdac_pcm_new (struct atmel_abdac *dac) +static int atmel_abdac_pcm_new (struct atmel_abdac *dac) {struct snd_pcm_hardware hw = atmel_abdac_hw;struct snd_pcm *pcm;
@@ -386,7 +386,7 @@ static int set_sample_rates(struct atmel_abdac *dac)return retval; } -static int __devinit atmel_abdac_probe (struct platform_device *pdev) +static int atmel_abdac_probe (struct platform_device *pdev) {struct snd_card *card;struct atmel_abdac *dac;
sound/atmel/ac97c.c +2 -2
@@ -756,7 +756,7 @@ static struct ac97_pcm at91_ac97_pcm_defs[] __devinitdata = { }, }; -static int __devinit atmel_ac97c_pcm_new (struct atmel_ac97c *chip) +static int atmel_ac97c_pcm_new (struct atmel_ac97c *chip) {struct snd_pcm *pcm;struct snd_pcm_hardware hw = atmel_ac97c_hw;
@@ -902,7 +902,7 @@ static void atmel_ac97c_reset(struct atmel_ac97c *chip) } } -static int __devinit atmel_ac97c_probe (struct platform_device *pdev) +static int atmel_ac97c_probe (struct platform_device *pdev) {struct snd_card *card;struct atmel_ac97c *chip;
sound/drivers/aloop.c +4 -4
@@ -774,7 +774,7 @@ static struct snd_pcm_ops loopback_capture_ops = { .mmap = snd_pcm_lib_mmap_vmalloc, }; -static int __devinit loopback_pcm_new (struct loopback *loopback, +static int loopback_pcm_new (struct loopback *loopback,int device,int substreams) {struct snd_pcm *pcm;
@@ -998,7 +998,7 @@ static struct snd_kcontrol_new loopback_controls[] __devinitdata = { } }; -static int __devinit loopback_mixer_new (struct loopback *loopback,int notify) +static int loopback_mixer_new (struct loopback *loopback,int notify) {struct snd_card *card = loopback->card;struct snd_pcm *pcm;
@@ -1111,7 +1111,7 @@ static void print_cable_info(struct snd_info_entry *entry,mutex_unlock (&loopback->cable_lock); } -static int __devinit loopback_proc_new (struct loopback *loopback,int cidx) +static int loopback_proc_new (struct loopback *loopback,int cidx) {char name[32 ];struct snd_info_entry *entry;
@@ -1132,7 +1132,7 @@ static int __devinit loopback_proc_new(struct loopback *loopback, int cidx)#endif -static int __devinit loopback_probe (struct platform_device *devptr) +static int loopback_probe (struct platform_device *devptr) {struct snd_card *card;struct loopback *loopback;
sound/drivers/dummy.c +4 -4
@@ -688,7 +688,7 @@ static struct snd_pcm_ops dummy_pcm_ops_no_buf = { .page = dummy_pcm_page, }; -static int __devinit snd_card_dummy_pcm (struct snd_dummy *dummy,int device, +static int snd_card_dummy_pcm (struct snd_dummy *dummy,int device,int substreams) {struct snd_pcm *pcm;
@@ -891,7 +891,7 @@ DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD), }, }; -static int __devinit snd_card_dummy_new_mixer (struct snd_dummy *dummy) +static int snd_card_dummy_new_mixer (struct snd_dummy *dummy) {struct snd_card *card = dummy->card;struct snd_kcontrol *kcontrol;
@@ -1031,7 +1031,7 @@ static void dummy_proc_write(struct snd_info_entry *entry, } } -static void __devinit dummy_proc_init (struct snd_dummy *chip) +static void dummy_proc_init (struct snd_dummy *chip) {struct snd_info_entry *entry;
@@ -1046,7 +1046,7 @@ static void __devinit dummy_proc_init(struct snd_dummy *chip)#define dummy_proc_init (x)#endif /* CONFIG_SND_DEBUG && CONFIG_PROC_FS */ -static int __devinit snd_dummy_probe (struct platform_device *devptr) +static int snd_dummy_probe (struct platform_device *devptr) {struct snd_card *card;struct snd_dummy *dummy;
sound/drivers/ml403-ac97cr.c +5 -9
@@ -1063,8 +1063,7 @@ snd_ml403_ac97cr_codec_write(struct snd_ac97 *ac97, unsigned short reg,return ; } -static int __devinit -snd_ml403_ac97cr_chip_init (struct snd_ml403_ac97cr *ml403_ac97cr) +static int snd_ml403_ac97cr_chip_init (struct snd_ml403_ac97cr *ml403_ac97cr) {unsigned long end_time;PDEBUG (INIT_INFO ,"chip_init():\n" );
@@ -1108,8 +1107,7 @@ static int snd_ml403_ac97cr_dev_free(struct snd_device *snddev)return snd_ml403_ac97cr_free (ml403_ac97cr); } -static int __devinit -snd_ml403_ac97cr_create (struct snd_card *card,struct platform_device *pfdev, +static int snd_ml403_ac97cr_create (struct snd_card *card,struct platform_device *pfdev,struct snd_ml403_ac97cr **rml403_ac97cr) {struct snd_ml403_ac97cr *ml403_ac97cr;
@@ -1204,8 +1202,7 @@ static void snd_ml403_ac97cr_mixer_free(struct snd_ac97 *ac97)PDEBUG (INIT_INFO ,"mixer_free(): (done)\n" ); } -static int __devinit -snd_ml403_ac97cr_mixer (struct snd_ml403_ac97cr *ml403_ac97cr) +static int snd_ml403_ac97cr_mixer (struct snd_ml403_ac97cr *ml403_ac97cr) {struct snd_ac97_bus *bus;struct snd_ac97_template ac97;
@@ -1237,8 +1234,7 @@ snd_ml403_ac97cr_mixer(struct snd_ml403_ac97cr *ml403_ac97cr)return err; } -static int __devinit -snd_ml403_ac97cr_pcm (struct snd_ml403_ac97cr *ml403_ac97cr,int device, +static int snd_ml403_ac97cr_pcm (struct snd_ml403_ac97cr *ml403_ac97cr,int device,struct snd_pcm **rpcm) {struct snd_pcm *pcm;
@@ -1268,7 +1264,7 @@ snd_ml403_ac97cr_pcm(struct snd_ml403_ac97cr *ml403_ac97cr, int device,return 0 ; } -static int __devinit snd_ml403_ac97cr_probe (struct platform_device *pfdev) +static int snd_ml403_ac97cr_probe (struct platform_device *pfdev) {struct snd_card *card;struct snd_ml403_ac97cr *ml403_ac97cr =NULL ;
sound/drivers/mpu401/mpu401.c +3 -3
@@ -100,7 +100,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)return err; } -static int __devinit snd_mpu401_probe (struct platform_device *devptr) +static int snd_mpu401_probe (struct platform_device *devptr) {int dev = devptr->id;int err;
@@ -156,7 +156,7 @@ static struct pnp_device_id snd_mpu401_pnpids[] = {MODULE_DEVICE_TABLE (pnp, snd_mpu401_pnpids); -static int __devinit snd_mpu401_pnp (int dev,struct pnp_dev *device, +static int snd_mpu401_pnp (int dev,struct pnp_dev *device,const struct pnp_device_id *id) { if (!pnp_port_valid(device, 0) ||
@@ -182,7 +182,7 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,return 0 ; } -static int __devinit snd_mpu401_pnp_probe (struct pnp_dev *pnp_dev, +static int snd_mpu401_pnp_probe (struct pnp_dev *pnp_dev,const struct pnp_device_id *id) {static int dev;
sound/drivers/mtpav.c +4 -4
@@ -583,7 +583,7 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id)/* * get ISA resources */ -static int __devinit snd_mtpav_get_ISA (struct mtpav * mcard) +static int snd_mtpav_get_ISA (struct mtpav * mcard) {if ((mcard->res_port =request_region (port,3 ,"MotuMTPAV MIDI" )) ==NULL ) {snd_printk (KERN_ERR "MTVAP port 0x%lx is busy\n" , port);
@@ -619,7 +619,7 @@ static struct snd_rawmidi_ops snd_mtpav_input = {* get RAWMIDI resources */ -static void __devinit snd_mtpav_set_name (struct mtpav *chip, +static void snd_mtpav_set_name (struct mtpav *chip,struct snd_rawmidi_substream *substream) {if (substream->number >=0 && substream->number < chip->num_ports)
@@ -634,7 +634,7 @@ static void __devinit snd_mtpav_set_name(struct mtpav *chip,strcpy (substream->name,"MTP broadcast" ); } -static int __devinit snd_mtpav_get_RAWMIDI (struct mtpav *mcard) +static int snd_mtpav_get_RAWMIDI (struct mtpav *mcard) {int rval;struct snd_rawmidi *rawmidi;
@@ -691,7 +691,7 @@ static void snd_mtpav_free(struct snd_card *card)/* */ -static int __devinit snd_mtpav_probe (struct platform_device *dev) +static int snd_mtpav_probe (struct platform_device *dev) {struct snd_card *card;int err;
sound/drivers/mts64.c +8 -8
@@ -83,7 +83,7 @@ static int snd_mts64_free(struct mts64 *mts)return 0 ; } -static int __devinit snd_mts64_create (struct snd_card *card, +static int snd_mts64_create (struct snd_card *card,struct pardevice *pardev,struct mts64 **rchip) {
@@ -214,7 +214,7 @@ static int mts64_device_ready(struct parport *p)* 0 init ok * -EIO failure */ -static int __devinit mts64_device_init (struct parport *p) +static int mts64_device_init (struct parport *p) {int i;
@@ -290,7 +290,7 @@ static u8 mts64_map_midi_input(u8 c)* 0 device found * -ENODEV no device */ -static int __devinit mts64_probe (struct parport *p) +static int mts64_probe (struct parport *p) {u8 c;
@@ -663,7 +663,7 @@ static struct snd_kcontrol_new mts64_ctl_smpte_fps __devinitdata = { }; -static int __devinit snd_mts64_ctl_create (struct snd_card *card, +static int snd_mts64_ctl_create (struct snd_card *card,struct mts64 *mts) {int err, i;
@@ -774,7 +774,7 @@ static struct snd_rawmidi_ops snd_mts64_rawmidi_input_ops = { };/* Create and initialize the rawmidi component */ -static int __devinit snd_mts64_rawmidi_create (struct snd_card *card) +static int snd_mts64_rawmidi_create (struct snd_card *card) {struct mts64 *mts = card->private_data;struct snd_rawmidi *rmidi;
@@ -860,7 +860,7 @@ __out:spin_unlock (&mts->lock); } -static int __devinit snd_mts64_probe_port (struct parport *p) +static int snd_mts64_probe_port (struct parport *p) {struct pardevice *pardev;int res;
@@ -884,7 +884,7 @@ static int __devinit snd_mts64_probe_port(struct parport *p)return res; } -static void __devinit snd_mts64_attach (struct parport *p) +static void snd_mts64_attach (struct parport *p) {struct platform_device *device;
@@ -940,7 +940,7 @@ static void snd_mts64_card_private_free(struct snd_card *card)snd_mts64_free (mts); } -static int __devinit snd_mts64_probe (struct platform_device *pdev) +static int snd_mts64_probe (struct platform_device *pdev) {struct pardevice *pardev;struct parport *p;
sound/drivers/pcsp/pcsp.c +4 -4
@@ -39,7 +39,7 @@ MODULE_PARM_DESC(nopcm, "Disable PC-Speaker PCM sound. Only beeps remain.");struct snd_pcsp pcsp_chip; -static int __devinit snd_pcsp_create (struct snd_card *card) +static int snd_pcsp_create (struct snd_card *card) {static struct snd_device_ops ops = { };struct timespec tp;
@@ -93,7 +93,7 @@ static int __devinit snd_pcsp_create(struct snd_card *card)return 0 ; } -static int __devinit snd_card_pcsp_probe (int devnum,struct device *dev) +static int snd_card_pcsp_probe (int devnum,struct device *dev) {struct snd_card *card;int err;
@@ -142,7 +142,7 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)return 0 ; } -static int __devinit alsa_card_pcsp_init (struct device *dev) +static int alsa_card_pcsp_init (struct device *dev) {int err;
@@ -166,7 +166,7 @@ static void __devexit alsa_card_pcsp_exit(struct snd_pcsp *chip)snd_card_free (chip->card); } -static int __devinit pcsp_probe (struct platform_device *dev) +static int pcsp_probe (struct platform_device *dev) {int err;
sound/drivers/pcsp/pcsp_input.c +1 -1
@@ -77,7 +77,7 @@ static int pcspkr_input_event(struct input_dev *dev, unsigned int type,return 0 ; } -int __devinit pcspkr_input_init (struct input_dev **rdev,struct device *dev) +int pcspkr_input_init (struct input_dev **rdev,struct device *dev) {int err;
sound/drivers/pcsp/pcsp_input.h +1 -1
@@ -7,7 +7,7 @@#ifndef __PCSP_INPUT_H__#define __PCSP_INPUT_H__ -int __devinit pcspkr_input_init (struct input_dev **rdev,struct device *dev); +int pcspkr_input_init (struct input_dev **rdev,struct device *dev);int pcspkr_input_remove (struct input_dev *dev);void pcspkr_stop_sound (void );
sound/drivers/pcsp/pcsp_lib.c +1 -1
@@ -334,7 +334,7 @@ static struct snd_pcm_ops snd_pcsp_playback_ops = { .pointer = snd_pcsp_playback_pointer, }; -int __devinit snd_pcsp_new_pcm (struct snd_pcsp *chip) +int snd_pcsp_new_pcm (struct snd_pcsp *chip) {int err;
sound/drivers/pcsp/pcsp_mixer.c +2 -2
@@ -128,7 +128,7 @@ static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_spkr[] = { PCSP_MIXER_CONTROL(pcspkr, "Beep Playback Switch"), }; -static int __devinit snd_pcsp_ctls_add (struct snd_pcsp *chip, +static int snd_pcsp_ctls_add (struct snd_pcsp *chip,struct snd_kcontrol_new *ctls,int num) {int i, err;
@@ -141,7 +141,7 @@ static int __devinit snd_pcsp_ctls_add(struct snd_pcsp *chip,return 0 ; } -int __devinit snd_pcsp_new_mixer (struct snd_pcsp *chip,int nopcm) +int snd_pcsp_new_mixer (struct snd_pcsp *chip,int nopcm) {int err;struct snd_card *card = chip->card;
sound/drivers/portman2x4.c +5 -5
@@ -96,7 +96,7 @@ static int portman_free(struct portman *pm)return 0 ; } -static int __devinit portman_create (struct snd_card *card, +static int portman_create (struct snd_card *card,struct pardevice *pardev,struct portman **rchip) {
@@ -561,7 +561,7 @@ static struct snd_rawmidi_ops snd_portman_midi_input = { };/* Create and initialize the rawmidi component */ -static int __devinit snd_portman_rawmidi_create (struct snd_card *card) +static int snd_portman_rawmidi_create (struct snd_card *card) {struct portman *pm = card->private_data;struct snd_rawmidi *rmidi;
@@ -648,7 +648,7 @@ static void snd_portman_interrupt(void *userdata)spin_unlock (&pm->reg_lock); } -static int __devinit snd_portman_probe_port (struct parport *p) +static int snd_portman_probe_port (struct parport *p) {struct pardevice *pardev;int res;
@@ -672,7 +672,7 @@ static int __devinit snd_portman_probe_port(struct parport *p)return res ? -EIO :0 ; } -static void __devinit snd_portman_attach (struct parport *p) +static void snd_portman_attach (struct parport *p) {struct platform_device *device;
@@ -728,7 +728,7 @@ static void snd_portman_card_private_free(struct snd_card *card)portman_free (pm); } -static int __devinit snd_portman_probe (struct platform_device *pdev) +static int snd_portman_probe (struct platform_device *pdev) {struct pardevice *pardev;struct parport *p;
sound/drivers/serial-u16550.c +5 -5
@@ -328,7 +328,7 @@ static void snd_uart16550_buffer_timer(unsigned long data)* return 0 if found * return negative error if not found */ -static int __devinit snd_uart16550_detect (struct snd_uart16550 *uart) +static int snd_uart16550_detect (struct snd_uart16550 *uart) {unsigned long io_base = uart->base;int ok;
@@ -783,7 +783,7 @@ static int snd_uart16550_dev_free(struct snd_device *device)return snd_uart16550_free (uart); } -static int __devinit snd_uart16550_create(struct snd_card *card, +static int snd_uart16550_create(struct snd_card *card, unsigned long iobase, int irq, unsigned int speed,
@@ -863,7 +863,7 @@ static int __devinit snd_uart16550_create(struct snd_card *card,return 0 ; } -static void __devinit snd_uart16550_substreams (struct snd_rawmidi_str *stream) +static void snd_uart16550_substreams (struct snd_rawmidi_str *stream) {struct snd_rawmidi_substream *substream;
@@ -872,7 +872,7 @@ static void __devinit snd_uart16550_substreams(struct snd_rawmidi_str *stream) } } -static int __devinit snd_uart16550_rmidi (struct snd_uart16550 *uart,int device, +static int snd_uart16550_rmidi (struct snd_uart16550 *uart,int device,int outs,int ins,struct snd_rawmidi **rmidi) {
@@ -899,7 +899,7 @@ static int __devinit snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,return 0 ; } -static int __devinit snd_serial_probe (struct platform_device *devptr) +static int snd_serial_probe (struct platform_device *devptr) {struct snd_card *card;struct snd_uart16550 *uart;
sound/drivers/virmidi.c +1 -1
@@ -83,7 +83,7 @@ struct snd_card_virmidi {static struct platform_device *devices[SNDRV_CARDS ]; -static int __devinit snd_virmidi_probe (struct platform_device *devptr) +static int snd_virmidi_probe (struct platform_device *devptr) {struct snd_card *card;struct snd_card_virmidi *vmidi;
sound/firewire/speakers.c +2 -2
@@ -663,7 +663,7 @@ static void fwspk_card_free(struct snd_card *card)mutex_destroy (&fwspk->mutex); } -static const struct device_info *__devinit fwspk_detect (struct fw_device *dev) +static const struct device_info *fwspk_detect (struct fw_device *dev) {static const struct device_info griffin_firewave = { .driver_name ="FireWave" ,
@@ -699,7 +699,7 @@ static const struct device_info *__devinit fwspk_detect(struct fw_device *dev)return NULL ; } -static int __devinit fwspk_probe (struct device *unit_dev) +static int fwspk_probe (struct device *unit_dev) {struct fw_unit *unit =fw_unit (unit_dev);struct fw_device *fw_dev =fw_parent_device (unit);
sound/isa/ad1816a/ad1816a.c +3 -3
@@ -94,7 +94,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_ad1816a_pnpids);#define DRIVER_NAME "snd-card-ad1816a" -static int __devinit snd_card_ad1816a_pnp (int dev,struct pnp_card_link *card, +static int snd_card_ad1816a_pnp (int dev,struct pnp_card_link *card,const struct pnp_card_device_id *id) {struct pnp_dev *pdev;
@@ -135,7 +135,7 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,return 0 ; } -static int __devinit snd_card_ad1816a_probe (int dev,struct pnp_card_link *pcard, +static int snd_card_ad1816a_probe (int dev,struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {int error;
@@ -219,7 +219,7 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcardstatic unsigned int __devinitdata ad1816a_devices; -static int __devinit snd_ad1816a_pnp_detect (struct pnp_card_link *card, +static int snd_ad1816a_pnp_detect (struct pnp_card_link *card,const struct pnp_card_device_id *id) {static int dev;
sound/isa/ad1816a/ad1816a_lib.c +6 -6
@@ -537,7 +537,7 @@ void snd_ad1816a_resume(struct snd_ad1816a *chip) }#endif -static int __devinit snd_ad1816a_probe (struct snd_ad1816a *chip) +static int snd_ad1816a_probe (struct snd_ad1816a *chip) {unsigned long flags;
@@ -583,7 +583,7 @@ static int snd_ad1816a_dev_free(struct snd_device *device)return snd_ad1816a_free (chip); } -static const char __devinit *snd_ad1816a_chip_id (struct snd_ad1816a *chip) +static const char *snd_ad1816a_chip_id (struct snd_ad1816a *chip) {switch (chip->hardware) {case AD1816A_HW_AD1816A :return "AD1816A" ;
@@ -596,7 +596,7 @@ static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip) } } -int __devinit snd_ad1816a_create (struct snd_card *card, +int snd_ad1816a_create (struct snd_card *card,unsigned long port,int irq,int dma1,int dma2,struct snd_ad1816a *chip) {
@@ -675,7 +675,7 @@ static struct snd_pcm_ops snd_ad1816a_capture_ops = { .pointer = snd_ad1816a_capture_pointer, }; -int __devinit snd_ad1816a_pcm (struct snd_ad1816a *chip,int device,struct snd_pcm **rpcm) +int snd_ad1816a_pcm (struct snd_ad1816a *chip,int device,struct snd_pcm **rpcm) {int error;struct snd_pcm *pcm;
@@ -702,7 +702,7 @@ int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_preturn 0 ; } -int __devinit snd_ad1816a_timer (struct snd_ad1816a *chip,int device,struct snd_timer **rtimer) +int snd_ad1816a_timer (struct snd_ad1816a *chip,int device,struct snd_timer **rtimer) {struct snd_timer *timer;struct snd_timer_id tid;
@@ -969,7 +969,7 @@ AD1816A_SINGLE("3D Control - Switch", AD1816A_3D_PHAT_CTRL, 15, 1, 1), AD1816A_SINGLE("3D Control - Level", AD1816A_3D_PHAT_CTRL, 0, 15, 0), }; -int __devinit snd_ad1816a_mixer (struct snd_ad1816a *chip) +int snd_ad1816a_mixer (struct snd_ad1816a *chip) {struct snd_card *card;unsigned int idx;
sound/isa/ad1848/ad1848.c +2 -2
@@ -64,7 +64,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");module_param_array (thinkpad, bool,NULL ,0444 );MODULE_PARM_DESC (thinkpad,"Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series." ); -static int __devinit snd_ad1848_match (struct device *dev,unsigned int n) +static int snd_ad1848_match (struct device *dev,unsigned int n) {if (!enable[n])return 0 ;
@@ -84,7 +84,7 @@ static int __devinit snd_ad1848_match(struct device *dev, unsigned int n)return 1 ; } -static int __devinit snd_ad1848_probe (struct device *dev,unsigned int n) +static int snd_ad1848_probe (struct device *dev,unsigned int n) {struct snd_card *card;struct snd_wss *chip;
sound/isa/adlib.c +2 -2
@@ -30,7 +30,7 @@ MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");module_param_array (port, long,NULL ,0444 );MODULE_PARM_DESC (port,"Port # for " CRD_NAME " driver." ); -static int __devinit snd_adlib_match (struct device *dev,unsigned int n) +static int snd_adlib_match (struct device *dev,unsigned int n) {if (!enable[n])return 0 ;
@@ -47,7 +47,7 @@ static void snd_adlib_free(struct snd_card *card)release_and_free_resource (card->private_data); } -static int __devinit snd_adlib_probe (struct device *dev,unsigned int n) +static int snd_adlib_probe (struct device *dev,unsigned int n) {struct snd_card *card;struct snd_opl3 *opl3;
sound/isa/als100.c +3 -3
@@ -117,7 +117,7 @@ static struct pnp_card_device_id snd_als100_pnpids[] = {MODULE_DEVICE_TABLE (pnp_card, snd_als100_pnpids); -static int __devinit snd_card_als100_pnp (int dev,struct snd_card_als100 *acard, +static int snd_card_als100_pnp (int dev,struct snd_card_als100 *acard,struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -183,7 +183,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,return 0 ; } -static int __devinit snd_card_als100_probe (int dev, +static int snd_card_als100_probe (int dev,struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -288,7 +288,7 @@ static int __devinit snd_card_als100_probe(int dev,static unsigned int __devinitdata als100_devices; -static int __devinit snd_als100_pnp_detect (struct pnp_card_link *card, +static int snd_als100_pnp_detect (struct pnp_card_link *card,const struct pnp_card_device_id *id) {static int dev;
sound/isa/azt2320.c +5 -5
@@ -99,7 +99,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_azt2320_pnpids);#define DRIVER_NAME "snd-card-azt2320" -static int __devinit snd_card_azt2320_pnp (int dev,struct snd_card_azt2320 *acard, +static int snd_card_azt2320_pnp (int dev,struct snd_card_azt2320 *acard,struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -147,7 +147,7 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar }/* same of snd_sbdsp_command by Jaroslav Kysela */ -static int __devinit snd_card_azt2320_command (unsigned long port,unsigned char val) +static int snd_card_azt2320_command (unsigned long port,unsigned char val) {int i;unsigned long limit;
@@ -161,7 +161,7 @@ static int __devinit snd_card_azt2320_command(unsigned long port, unsigned charreturn -EBUSY ; } -static int __devinit snd_card_azt2320_enable_wss (unsigned long port) +static int snd_card_azt2320_enable_wss (unsigned long port) {int error;
@@ -174,7 +174,7 @@ static int __devinit snd_card_azt2320_enable_wss(unsigned long port)return 0 ; } -static int __devinit snd_card_azt2320_probe (int dev, +static int snd_card_azt2320_probe (int dev,struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -266,7 +266,7 @@ static int __devinit snd_card_azt2320_probe(int dev,static unsigned int __devinitdata azt2320_devices; -static int __devinit snd_azt2320_pnp_detect (struct pnp_card_link *card, +static int snd_azt2320_pnp_detect (struct pnp_card_link *card,const struct pnp_card_device_id *id) {static int dev;
sound/isa/cmi8328.c +2 -2
@@ -140,7 +140,7 @@ static void snd_cmi8328_cfg_restore(u16 port, u8 cfg[])snd_cmi8328_cfg_write (port,CFG3 , cfg[2 ]); } -static int __devinit snd_cmi8328_mixer (struct snd_wss *chip) +static int snd_cmi8328_mixer (struct snd_wss *chip) {struct snd_card *card;struct snd_ctl_elem_id id1, id2;
@@ -212,7 +212,7 @@ int array_find_l(long array[], long item)return -1 ; } -static int __devinit snd_cmi8328_probe (struct device *pdev,unsigned int ndev) +static int snd_cmi8328_probe (struct device *pdev,unsigned int ndev) {struct snd_card *card;struct snd_opl3 *opl3;
sound/isa/cmi8330.c +8 -8
@@ -281,7 +281,7 @@ static unsigned char cmi8330_sb_init_values[][2] __devinitdata = { }; -static int __devinit cmi8330_add_sb_mixers (struct snd_sb *chip) +static int cmi8330_add_sb_mixers (struct snd_sb *chip) {int idx, err;unsigned long flags;
@@ -306,7 +306,7 @@ static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip) }#endif -static int __devinit snd_cmi8330_mixer (struct snd_card *card,struct snd_cmi8330 *acard) +static int snd_cmi8330_mixer (struct snd_card *card,struct snd_cmi8330 *acard) {unsigned int idx;int err;
@@ -329,7 +329,7 @@ static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 }#ifdef CONFIG_PNP -static int __devinit snd_cmi8330_pnp (int dev,struct snd_cmi8330 *acard, +static int snd_cmi8330_pnp (int dev,struct snd_cmi8330 *acard,struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -437,7 +437,7 @@ static int snd_cmi8330_capture_open(struct snd_pcm_substream *substream)return chip->streams[SNDRV_PCM_STREAM_CAPTURE ].open (substream); } -static int __devinit snd_cmi8330_pcm (struct snd_card *card,struct snd_cmi8330 *chip) +static int snd_cmi8330_pcm (struct snd_card *card,struct snd_cmi8330 *chip) {struct snd_pcm *pcm;const struct snd_pcm_ops *ops;
@@ -532,7 +532,7 @@ static int snd_cmi8330_card_new(int dev, struct snd_card **cardp)return 0 ; } -static int __devinit snd_cmi8330_probe (struct snd_card *card,int dev) +static int snd_cmi8330_probe (struct snd_card *card,int dev) {struct snd_cmi8330 *acard;int i, err;
@@ -613,7 +613,7 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)return snd_card_register (card); } -static int __devinit snd_cmi8330_isa_match (struct device *pdev, +static int snd_cmi8330_isa_match (struct device *pdev,unsigned int dev) {if (!enable[dev] ||is_isapnp_selected (dev))
@@ -629,7 +629,7 @@ static int __devinit snd_cmi8330_isa_match(struct device *pdev,return 1 ; } -static int __devinit snd_cmi8330_isa_probe (struct device *pdev, +static int snd_cmi8330_isa_probe (struct device *pdev,unsigned int dev) {struct snd_card *card;
@@ -685,7 +685,7 @@ static struct isa_driver snd_cmi8330_driver = {#ifdef CONFIG_PNP -static int __devinit snd_cmi8330_pnp_detect (struct pnp_card_link *pcard, +static int snd_cmi8330_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {static int dev;
sound/isa/cs423x/cs4231.c +2 -2
@@ -68,7 +68,7 @@ MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");module_param_array (dma2, int,NULL ,0444 );MODULE_PARM_DESC (dma2,"DMA2 # for " CRD_NAME " driver." ); -static int __devinit snd_cs4231_match (struct device *dev,unsigned int n) +static int snd_cs4231_match (struct device *dev,unsigned int n) {if (!enable[n])return 0 ;
@@ -88,7 +88,7 @@ static int __devinit snd_cs4231_match(struct device *dev, unsigned int n)return 1 ; } -static int __devinit snd_cs4231_probe (struct device *dev,unsigned int n) +static int snd_cs4231_probe (struct device *dev,unsigned int n) {struct snd_card *card;struct snd_wss *chip;
sound/isa/cs423x/cs4236.c +10 -10
@@ -251,7 +251,7 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = {MODULE_DEVICE_TABLE (pnp_card, snd_cs423x_pnpids);/* WSS initialization */ -static int __devinit snd_cs423x_pnp_init_wss (int dev,struct pnp_dev *pdev) +static int snd_cs423x_pnp_init_wss (int dev,struct pnp_dev *pdev) {if (pnp_activate_dev (pdev) <0 ) { printk(KERN_ERR IDENT " WSS PnP configure failed for WSS (out of resources?)\n");
@@ -272,7 +272,7 @@ static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev) }/* CTRL initialization */ -static int __devinit snd_cs423x_pnp_init_ctrl (int dev,struct pnp_dev *pdev) +static int snd_cs423x_pnp_init_ctrl (int dev,struct pnp_dev *pdev) {if (pnp_activate_dev (pdev) <0 ) { printk(KERN_ERR IDENT " CTRL PnP configure failed for WSS (out of resources?)\n");
@@ -284,7 +284,7 @@ static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev) }/* MPU initialization */ -static int __devinit snd_cs423x_pnp_init_mpu (int dev,struct pnp_dev *pdev) +static int snd_cs423x_pnp_init_mpu (int dev,struct pnp_dev *pdev) {if (pnp_activate_dev (pdev) <0 ) { printk(KERN_ERR IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n");
@@ -303,7 +303,7 @@ static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)return 0 ; } -static int __devinit snd_card_cs423x_pnp (int dev,struct snd_card_cs4236 *acard, +static int snd_card_cs423x_pnp (int dev,struct snd_card_cs4236 *acard,struct pnp_dev *pdev,struct pnp_dev *cdev) {
@@ -317,7 +317,7 @@ static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,return 0 ; } -static int __devinit snd_card_cs423x_pnpc (int dev,struct snd_card_cs4236 *acard, +static int snd_card_cs423x_pnpc (int dev,struct snd_card_cs4236 *acard,struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -378,7 +378,7 @@ static int snd_cs423x_card_new(int dev, struct snd_card **cardp)return 0 ; } -static int __devinit snd_cs423x_probe (struct snd_card *card,int dev) +static int snd_cs423x_probe (struct snd_card *card,int dev) {struct snd_card_cs4236 *acard;struct snd_pcm *pcm;
@@ -456,7 +456,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)return snd_card_register (card); } -static int __devinit snd_cs423x_isa_match (struct device *pdev, +static int snd_cs423x_isa_match (struct device *pdev,unsigned int dev) {if (!enable[dev] ||is_isapnp_selected (dev))
@@ -481,7 +481,7 @@ static int __devinit snd_cs423x_isa_match(struct device *pdev,return 1 ; } -static int __devinit snd_cs423x_isa_probe (struct device *pdev, +static int snd_cs423x_isa_probe (struct device *pdev,unsigned int dev) {struct snd_card *card;
@@ -552,7 +552,7 @@ static struct isa_driver cs423x_isa_driver = {#ifdef CONFIG_PNP -static int __devinit snd_cs423x_pnpbios_detect (struct pnp_dev *pdev, +static int snd_cs423x_pnpbios_detect (struct pnp_dev *pdev,const struct pnp_device_id *id) {static int dev;
@@ -626,7 +626,7 @@ static struct pnp_driver cs423x_pnp_driver = {#endif }; -static int __devinit snd_cs423x_pnpc_detect (struct pnp_card_link *pcard, +static int snd_cs423x_pnpc_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {static int dev;
sound/isa/es1688/es1688.c +6 -6
@@ -90,12 +90,12 @@ MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");#define is_isapnp_selected (dev) 0#endif -static int __devinit snd_es1688_match (struct device *dev,unsigned int n) +static int snd_es1688_match (struct device *dev,unsigned int n) {return enable[n] && !is_isapnp_selected (n); } -static int __devinit snd_es1688_legacy_create (struct snd_card *card, +static int snd_es1688_legacy_create (struct snd_card *card,struct device *dev,unsigned int n) {struct snd_es1688 *chip = card->private_data;
@@ -134,7 +134,7 @@ static int __devinit snd_es1688_legacy_create(struct snd_card *card,return error; } -static int __devinit snd_es1688_probe (struct snd_card *card,unsigned int n) +static int snd_es1688_probe (struct snd_card *card,unsigned int n) {struct snd_es1688 *chip = card->private_data;struct snd_opl3 *opl3;
@@ -182,7 +182,7 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)return snd_card_register (card); } -static int __devinit snd_es1688_isa_probe (struct device *dev,unsigned int n) +static int snd_es1688_isa_probe (struct device *dev,unsigned int n) {struct snd_card *card;int error;
@@ -233,7 +233,7 @@ static struct isa_driver snd_es1688_driver = {static int snd_es968_pnp_is_probed;#ifdef CONFIG_PNP -static int __devinit snd_card_es968_pnp (struct snd_card *card,unsigned int n, +static int snd_card_es968_pnp (struct snd_card *card,unsigned int n,struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {
@@ -258,7 +258,7 @@ static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n, mpu_irq[n], dma8[n], ES1688_HW_AUTO); } -static int __devinit snd_es968_pnp_detect (struct pnp_card_link *pcard, +static int snd_es968_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {struct snd_card *card;
sound/isa/es18xx.c +18 -18
@@ -348,7 +348,7 @@ static inline int snd_es18xx_mixer_writable(struct snd_es18xx *chip, unsigned ch } -static int __devinit snd_es18xx_reset (struct snd_es18xx *chip) +static int snd_es18xx_reset (struct snd_es18xx *chip) {int i;outb (0x03 , chip->port +0x06 );
@@ -1363,7 +1363,7 @@ static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = { ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0), }; -static int __devinit snd_es18xx_config_read (struct snd_es18xx *chip,unsigned char reg) +static int snd_es18xx_config_read (struct snd_es18xx *chip,unsigned char reg) {int data;
@@ -1372,7 +1372,7 @@ static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned chreturn data; } -static void __devinit snd_es18xx_config_write (struct snd_es18xx *chip, +static void snd_es18xx_config_write (struct snd_es18xx *chip,unsigned char reg,unsigned char data) {/* No need for spinlocks, this function is used only in
@@ -1384,7 +1384,7 @@ static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip,#endif } -static int __devinit snd_es18xx_initialize (struct snd_es18xx *chip, +static int snd_es18xx_initialize (struct snd_es18xx *chip,unsigned long mpu_port,unsigned long fm_port) {
@@ -1549,7 +1549,7 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,return 0 ; } -static int __devinit snd_es18xx_identify (struct snd_es18xx *chip) +static int snd_es18xx_identify (struct snd_es18xx *chip) {int hi,lo;
@@ -1618,7 +1618,7 @@ static int __devinit snd_es18xx_identify(struct snd_es18xx *chip)return 0 ; } -static int __devinit snd_es18xx_probe (struct snd_es18xx *chip, +static int snd_es18xx_probe (struct snd_es18xx *chip,unsigned long mpu_port,unsigned long fm_port) {
@@ -1680,7 +1680,7 @@ static struct snd_pcm_ops snd_es18xx_capture_ops = { .pointer = snd_es18xx_capture_pointer, }; -static int __devinit snd_es18xx_pcm (struct snd_card *card,int device, +static int snd_es18xx_pcm (struct snd_card *card,int device,struct snd_pcm **rpcm) {struct snd_es18xx *chip = card->private_data;
@@ -1777,7 +1777,7 @@ static int snd_es18xx_dev_free(struct snd_device *device)return snd_es18xx_free (device->card); } -static int __devinit snd_es18xx_new_device(struct snd_card *card, +static int snd_es18xx_new_device(struct snd_card *card, unsigned long port, unsigned long mpu_port, unsigned long fm_port,
@@ -1839,7 +1839,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card,return 0 ; } -static int __devinit snd_es18xx_mixer (struct snd_card *card) +static int snd_es18xx_mixer (struct snd_card *card) {struct snd_es18xx *chip = card->private_data;int err;
@@ -2016,7 +2016,7 @@ static struct pnp_device_id snd_audiodrive_pnpbiosids[] = {MODULE_DEVICE_TABLE (pnp, snd_audiodrive_pnpbiosids);/* PnP main device initialization */ -static int __devinit snd_audiodrive_pnp_init_main (int dev,struct pnp_dev *pdev) +static int snd_audiodrive_pnp_init_main (int dev,struct pnp_dev *pdev) {if (pnp_activate_dev (pdev) <0 ) { snd_printk(KERN_ERR PFX "PnP configure failure (out of resources?)\n");
@@ -2043,7 +2043,7 @@ static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)return 0 ; } -static int __devinit snd_audiodrive_pnp (int dev,struct snd_es18xx *chip, +static int snd_audiodrive_pnp (int dev,struct snd_es18xx *chip,struct pnp_dev *pdev) { chip->dev = pdev;
@@ -2073,7 +2073,7 @@ static struct pnp_card_device_id snd_audiodrive_pnpids[] = {MODULE_DEVICE_TABLE (pnp_card, snd_audiodrive_pnpids); -static int __devinit snd_audiodrive_pnpc (int dev,struct snd_es18xx *chip, +static int snd_audiodrive_pnpc (int dev,struct snd_es18xx *chip,struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -2111,7 +2111,7 @@ static int snd_es18xx_card_new(int dev, struct snd_card **cardp) sizeof(struct snd_es18xx), cardp); } -static int __devinit snd_audiodrive_probe (struct snd_card *card,int dev) +static int snd_audiodrive_probe (struct snd_card *card,int dev) {struct snd_es18xx *chip = card->private_data;struct snd_opl3 *opl3;
@@ -2169,12 +2169,12 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)return snd_card_register (card); } -static int __devinit snd_es18xx_isa_match (struct device *pdev,unsigned int dev) +static int snd_es18xx_isa_match (struct device *pdev,unsigned int dev) {return enable[dev] && !is_isapnp_selected (dev); } -static int __devinit snd_es18xx_isa_probe1 (int dev,struct device *devptr) +static int snd_es18xx_isa_probe1 (int dev,struct device *devptr) {struct snd_card *card;int err;
@@ -2191,7 +2191,7 @@ static int __devinit snd_es18xx_isa_probe1(int dev, struct device *devptr)return 0 ; } -static int __devinit snd_es18xx_isa_probe (struct device *pdev,unsigned int dev) +static int snd_es18xx_isa_probe (struct device *pdev,unsigned int dev) {int err;static int possible_irqs[] = {5 ,9 ,10 ,7 ,11 ,12 ,-1 };
@@ -2269,7 +2269,7 @@ static struct isa_driver snd_es18xx_isa_driver = {#ifdef CONFIG_PNP -static int __devinit snd_audiodrive_pnp_detect (struct pnp_dev *pdev, +static int snd_audiodrive_pnp_detect (struct pnp_dev *pdev,const struct pnp_device_id *id) {static int dev;
@@ -2330,7 +2330,7 @@ static struct pnp_driver es18xx_pnp_driver = {#endif }; -static int __devinit snd_audiodrive_pnpc_detect (struct pnp_card_link *pcard, +static int snd_audiodrive_pnpc_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {static int dev;
sound/isa/galaxy/galaxy.c +11 -11
@@ -84,7 +84,7 @@ MODULE_PARM_DESC(dma2, "Capture DMA # for " CRD_NAME " driver.");#define DSP_COMMAND_GET_VERSION 0xe1 -static int __devinit dsp_get_byte (void __iomem *port,u8 *val) +static int dsp_get_byte (void __iomem *port,u8 *val) {int loops =1000 ;
@@ -97,7 +97,7 @@ static int __devinit dsp_get_byte(void __iomem *port, u8 *val)return 0 ; } -static int __devinit dsp_reset (void __iomem *port) +static int dsp_reset (void __iomem *port) {u8 val;
@@ -111,7 +111,7 @@ static int __devinit dsp_reset(void __iomem *port)return 0 ; } -static int __devinit dsp_command (void __iomem *port,u8 cmd) +static int dsp_command (void __iomem *port,u8 cmd) {int loops =1000 ;
@@ -124,7 +124,7 @@ static int __devinit dsp_command(void __iomem *port, u8 cmd)return 0 ; } -static int __devinit dsp_get_version (void __iomem *port,u8 *major,u8 *minor) +static int dsp_get_version (void __iomem *port,u8 *major,u8 *minor) {int err;
@@ -161,7 +161,7 @@ static int __devinit dsp_get_version(void __iomem *port, u8 *major, u8 *minor)#define WSS_SIGNATURE 4 -static int __devinit wss_detect (void __iomem *wss_port) +static int wss_detect (void __iomem *wss_port) {if ((ioread8 (wss_port +WSS_PORT_SIGNATURE ) &0x3f ) !=WSS_SIGNATURE )return -ENODEV ;
@@ -204,7 +204,7 @@ struct snd_galaxy {static u32 config[SNDRV_CARDS ];static u8 wss_config[SNDRV_CARDS ]; -static int __devinit snd_galaxy_match (struct device *dev,unsigned int n) +static int snd_galaxy_match (struct device *dev,unsigned int n) {if (!enable[n])return 0 ;
@@ -379,7 +379,7 @@ fm:return 1 ; } -static int __devinit galaxy_init (struct snd_galaxy *galaxy,u8 *type) +static int galaxy_init (struct snd_galaxy *galaxy,u8 *type) {u8 major;u8 minor;
@@ -411,7 +411,7 @@ static int __devinit galaxy_init(struct snd_galaxy *galaxy, u8 *type)return 0 ; } -static int __devinit galaxy_set_mode (struct snd_galaxy *galaxy,u8 mode) +static int galaxy_set_mode (struct snd_galaxy *galaxy,u8 mode) {int err;
@@ -449,7 +449,7 @@ static void galaxy_set_config(struct snd_galaxy *galaxy, u32 config)msleep (10 ); } -static void __devinit galaxy_config (struct snd_galaxy *galaxy,u32 config) +static void galaxy_config (struct snd_galaxy *galaxy,u32 config) {int i;
@@ -461,7 +461,7 @@ static void __devinit galaxy_config(struct snd_galaxy *galaxy, u32 config)galaxy_set_config (galaxy, config); } -static int __devinit galaxy_wss_config (struct snd_galaxy *galaxy,u8 wss_config) +static int galaxy_wss_config (struct snd_galaxy *galaxy,u8 wss_config) {int err;
@@ -498,7 +498,7 @@ static void snd_galaxy_free(struct snd_card *card) } } -static int __devinit snd_galaxy_probe (struct device *dev,unsigned int n) +static int snd_galaxy_probe (struct device *dev,unsigned int n) {struct snd_galaxy *galaxy;struct snd_wss *chip;
sound/isa/gus/gusclassic.c +4 -4
@@ -73,12 +73,12 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver.");module_param_array (pcm_channels, int,NULL ,0444 );MODULE_PARM_DESC (pcm_channels,"Reserved PCM channels for " CRD_NAME " driver." ); -static int __devinit snd_gusclassic_match (struct device *dev,unsigned int n) +static int snd_gusclassic_match (struct device *dev,unsigned int n) {return enable[n]; } -static int __devinit snd_gusclassic_create (struct snd_card *card, +static int snd_gusclassic_create (struct snd_card *card,struct device *dev,unsigned int n,struct snd_gus_card **rgus) {static long possible_ports[] = {0x220 ,0x230 ,0x240 ,0x250 ,0x260 };
@@ -123,7 +123,7 @@ static int __devinit snd_gusclassic_create(struct snd_card *card,return error; } -static int __devinit snd_gusclassic_detect (struct snd_gus_card *gus) +static int snd_gusclassic_detect (struct snd_gus_card *gus) {unsigned char d;
@@ -142,7 +142,7 @@ static int __devinit snd_gusclassic_detect(struct snd_gus_card *gus)return 0 ; } -static int __devinit snd_gusclassic_probe (struct device *dev,unsigned int n) +static int snd_gusclassic_probe (struct device *dev,unsigned int n) {struct snd_card *card;struct snd_gus_card *gus;
sound/isa/gus/gusextreme.c +6 -6
@@ -89,12 +89,12 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver.");module_param_array (pcm_channels, int,NULL ,0444 );MODULE_PARM_DESC (pcm_channels,"Reserved PCM channels for " CRD_NAME " driver." ); -static int __devinit snd_gusextreme_match (struct device *dev,unsigned int n) +static int snd_gusextreme_match (struct device *dev,unsigned int n) {return enable[n]; } -static int __devinit snd_gusextreme_es1688_create (struct snd_card *card, +static int snd_gusextreme_es1688_create (struct snd_card *card,struct snd_es1688 *chip,struct device *dev,unsigned int n) {static long possible_ports[] = {0x220 ,0x240 ,0x260 };
@@ -132,7 +132,7 @@ static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,return error; } -static int __devinit snd_gusextreme_gus_card_create (struct snd_card *card, +static int snd_gusextreme_gus_card_create (struct snd_card *card,struct device *dev,unsigned int n,struct snd_gus_card **rgus) {static int possible_irqs[] = {11 ,12 ,15 ,9 ,5 ,7 ,3 ,-1 };
@@ -156,7 +156,7 @@ static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card, 0, channels[n], pcm_channels[n], 0, rgus); } -static int __devinit snd_gusextreme_detect (struct snd_gus_card *gus, +static int snd_gusextreme_detect (struct snd_gus_card *gus,struct snd_es1688 *es1688) {unsigned long flags;
@@ -206,7 +206,7 @@ static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus,return 0 ; } -static int __devinit snd_gusextreme_mixer (struct snd_card *card) +static int snd_gusextreme_mixer (struct snd_card *card) {struct snd_ctl_elem_id id1, id2;int error;
@@ -232,7 +232,7 @@ static int __devinit snd_gusextreme_mixer(struct snd_card *card)return 0 ; } -static int __devinit snd_gusextreme_probe (struct device *dev,unsigned int n) +static int snd_gusextreme_probe (struct device *dev,unsigned int n) {struct snd_card *card;struct snd_gus_card *gus;
sound/isa/gus/gusmax.c +5 -5
@@ -82,7 +82,7 @@ struct snd_gusmax {#define PFX "gusmax: " -static int __devinit snd_gusmax_detect (struct snd_gus_card * gus) +static int snd_gusmax_detect (struct snd_gus_card * gus) {unsigned char d;
@@ -124,7 +124,7 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)return IRQ_RETVAL (handled); } -static void __devinit snd_gusmax_init (int dev,struct snd_card *card, +static void snd_gusmax_init (int dev,struct snd_card *card,struct snd_gus_card * gus) { gus->equal_irq =1 ;
@@ -140,7 +140,7 @@ static void __devinit snd_gusmax_init(int dev, struct snd_card *card,outb (gus->max_cntrl_val,GUSP (gus,MAXCNTRLPORT )); } -static int __devinit snd_gusmax_mixer (struct snd_wss *chip) +static int snd_gusmax_mixer (struct snd_wss *chip) {struct snd_card *card = chip->card;struct snd_ctl_elem_id id1, id2;
@@ -199,12 +199,12 @@ static void snd_gusmax_free(struct snd_card *card)free_irq (maxcard->irq, (void *)maxcard); } -static int __devinit snd_gusmax_match (struct device *pdev,unsigned int dev) +static int snd_gusmax_match (struct device *pdev,unsigned int dev) {return enable[dev]; } -static int __devinit snd_gusmax_probe (struct device *pdev,unsigned int dev) +static int snd_gusmax_probe (struct device *pdev,unsigned int dev) {static int possible_irqs[] = {5 ,11 ,12 ,9 ,7 ,15 ,3 ,-1 };static int possible_dmas[] = {5 ,6 ,7 ,1 ,3 ,-1 };
sound/isa/gus/interwave.c +13 -13
@@ -207,7 +207,7 @@ static struct snd_i2c_bit_ops snd_interwave_i2c_bit_ops = { .getdata = snd_interwave_i2c_getdataline, }; -static int __devinit snd_interwave_detect_stb (struct snd_interwave *iwcard, +static int snd_interwave_detect_stb (struct snd_interwave *iwcard,struct snd_gus_card * gus,int dev,struct snd_i2c_bus **rbus) {
@@ -249,7 +249,7 @@ static int __devinit snd_interwave_detect_stb(struct snd_interwave *iwcard, }#endif -static int __devinit snd_interwave_detect(struct snd_interwave *iwcard, +static int snd_interwave_detect(struct snd_interwave *iwcard, struct snd_gus_card * gus, int dev #ifdef SNDRV_STB
@@ -318,7 +318,7 @@ static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id)return IRQ_RETVAL (handled); } -static void __devinit snd_interwave_reset (struct snd_gus_card * gus) +static void snd_interwave_reset (struct snd_gus_card * gus) {snd_gf1_write8 (gus,SNDRV_GF1_GB_RESET ,0x00 );udelay (160 );
@@ -326,7 +326,7 @@ static void __devinit snd_interwave_reset(struct snd_gus_card * gus)udelay (160 ); } -static void __devinit snd_interwave_bank_sizes (struct snd_gus_card * gus,int *sizes) +static void snd_interwave_bank_sizes (struct snd_gus_card * gus,int *sizes) {unsigned int idx;unsigned int local;
@@ -377,7 +377,7 @@ struct rom_hdr {/* 511 */ unsigned char csum; }; -static void __devinit snd_interwave_detect_memory (struct snd_gus_card * gus) +static void snd_interwave_detect_memory (struct snd_gus_card * gus) {static unsigned int lmc[13 ] = {
@@ -475,7 +475,7 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)snd_interwave_reset (gus); } -static void __devinit snd_interwave_init (int dev,struct snd_gus_card * gus) +static void snd_interwave_init (int dev,struct snd_gus_card * gus) {unsigned long flags;
@@ -508,7 +508,7 @@ WSS_DOUBLE("Mic Playback Volume", 0, CS4231_LEFT_MIC_INPUT, CS4231_RIGHT_MIC_INPUT, 0, 0, 31, 1) }; -static int __devinit snd_interwave_mixer (struct snd_wss *chip) +static int snd_interwave_mixer (struct snd_wss *chip) {struct snd_card *card = chip->card;struct snd_ctl_elem_id id1, id2;
@@ -558,7 +558,7 @@ static int __devinit snd_interwave_mixer(struct snd_wss *chip)#ifdef CONFIG_PNP -static int __devinit snd_interwave_pnp (int dev,struct snd_interwave *iwcard, +static int snd_interwave_pnp (int dev,struct snd_interwave *iwcard,struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -644,7 +644,7 @@ static int snd_interwave_card_new(int dev, struct snd_card **cardp)return 0 ; } -static int __devinit snd_interwave_probe (struct snd_card *card,int dev) +static int snd_interwave_probe (struct snd_card *card,int dev) {int xirq, xdma1, xdma2;struct snd_interwave *iwcard = card->private_data;
@@ -775,7 +775,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)return 0 ; } -static int __devinit snd_interwave_isa_probe1 (int dev,struct device *devptr) +static int snd_interwave_isa_probe1 (int dev,struct device *devptr) {struct snd_card *card;int err;
@@ -793,7 +793,7 @@ static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr)return 0 ; } -static int __devinit snd_interwave_isa_match (struct device *pdev, +static int snd_interwave_isa_match (struct device *pdev,unsigned int dev) {if (!enable[dev])
@@ -805,7 +805,7 @@ static int __devinit snd_interwave_isa_match(struct device *pdev,return 1 ; } -static int __devinit snd_interwave_isa_probe (struct device *pdev, +static int snd_interwave_isa_probe (struct device *pdev,unsigned int dev) {int err;
@@ -864,7 +864,7 @@ static struct isa_driver snd_interwave_driver = { };#ifdef CONFIG_PNP -static int __devinit snd_interwave_pnp_detect (struct pnp_card_link *pcard, +static int snd_interwave_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {static int dev;
sound/isa/msnd/msnd.h +1 -1
@@ -303,6 +303,6 @@ int snd_msndmidi_new(struct snd_card *card, int device);void snd_msndmidi_input_read (void *mpu);void snd_msndmix_setup (struct snd_msnd *chip); -int __devinit snd_msndmix_new (struct snd_card *card); +int snd_msndmix_new (struct snd_card *card);int snd_msndmix_force_recsrc (struct snd_msnd *chip,int recsrc);#endif /* __MSND_H */
sound/isa/msnd/msnd_pinnacle.c +15 -15
@@ -78,7 +78,7 @@# define LOGNAME "snd_msnd_pinnacle"#endif -static void __devinit set_default_audio_parameters (struct snd_msnd *chip) +static void set_default_audio_parameters (struct snd_msnd *chip) { chip->play_sample_size =DEFSAMPLESIZE ; chip->play_sample_rate =DEFSAMPLERATE ;
@@ -213,7 +213,7 @@ static int snd_msnd_reset_dsp(long io, unsigned char *info)return -EIO ; } -static int __devinit snd_msnd_probe (struct snd_card *card) +static int snd_msnd_probe (struct snd_card *card) {struct snd_msnd *chip = card->private_data;unsigned char info;
@@ -497,7 +497,7 @@ static int snd_msnd_send_dsp_cmd_chk(struct snd_msnd *chip, u8 cmd)return snd_msnd_send_dsp_cmd (chip, cmd); } -static int __devinit snd_msnd_calibrate_adc (struct snd_msnd *chip,u16 srate) +static int snd_msnd_calibrate_adc (struct snd_msnd *chip,u16 srate) {snd_printdd ("snd_msnd_calibrate_adc(%i)\n" , srate);writew (srate, chip->SMA + SMA_wCalFreqAtoD);
@@ -535,7 +535,7 @@ static void snd_msnd_mpu401_close(struct snd_mpu401 *mpu)static long mpu_io[SNDRV_CARDS ] =SNDRV_DEFAULT_PORT ;static int mpu_irq[SNDRV_CARDS ] =SNDRV_DEFAULT_IRQ ; -static int __devinit snd_msnd_attach (struct snd_card *card) +static int snd_msnd_attach (struct snd_card *card) {struct snd_msnd *chip = card->private_data;int err;
@@ -649,7 +649,7 @@ static void __devexit snd_msnd_unload(struct snd_card *card)/* Pinnacle/Fiji Logical Device Configuration */ -static int __devinit snd_msnd_write_cfg (int cfg,int reg,int value) +static int snd_msnd_write_cfg (int cfg,int reg,int value) {outb (reg, cfg);outb (value, cfg +1 );
@@ -660,7 +660,7 @@ static int __devinit snd_msnd_write_cfg(int cfg, int reg, int value)return 0 ; } -static int __devinit snd_msnd_write_cfg_io0 (int cfg,int num,u16 io) +static int snd_msnd_write_cfg_io0 (int cfg,int num,u16 io) {if (snd_msnd_write_cfg (cfg,IREG_LOGDEVICE , num))return -EIO ;
@@ -671,7 +671,7 @@ static int __devinit snd_msnd_write_cfg_io0(int cfg, int num, u16 io)return 0 ; } -static int __devinit snd_msnd_write_cfg_io1 (int cfg,int num,u16 io) +static int snd_msnd_write_cfg_io1 (int cfg,int num,u16 io) {if (snd_msnd_write_cfg (cfg,IREG_LOGDEVICE , num))return -EIO ;
@@ -682,7 +682,7 @@ static int __devinit snd_msnd_write_cfg_io1(int cfg, int num, u16 io)return 0 ; } -static int __devinit snd_msnd_write_cfg_irq (int cfg,int num,u16 irq) +static int snd_msnd_write_cfg_irq (int cfg,int num,u16 irq) {if (snd_msnd_write_cfg (cfg,IREG_LOGDEVICE , num))return -EIO ;
@@ -693,7 +693,7 @@ static int __devinit snd_msnd_write_cfg_irq(int cfg, int num, u16 irq)return 0 ; } -static int __devinit snd_msnd_write_cfg_mem (int cfg,int num,int mem) +static int snd_msnd_write_cfg_mem (int cfg,int num,int mem) {u16 wmem;
@@ -711,7 +711,7 @@ static int __devinit snd_msnd_write_cfg_mem(int cfg, int num, int mem)return 0 ; } -static int __devinit snd_msnd_activate_logical (int cfg,int num) +static int snd_msnd_activate_logical (int cfg,int num) {if (snd_msnd_write_cfg (cfg,IREG_LOGDEVICE , num))return -EIO ;
@@ -720,7 +720,7 @@ static int __devinit snd_msnd_activate_logical(int cfg, int num)return 0 ; } -static int __devinit snd_msnd_write_cfg_logical (int cfg,int num,u16 io0, +static int snd_msnd_write_cfg_logical (int cfg,int num,u16 io0,u16 io1,u16 irq,int mem) {if (snd_msnd_write_cfg (cfg,IREG_LOGDEVICE , num))
@@ -738,7 +738,7 @@ static int __devinit snd_msnd_write_cfg_logical(int cfg, int num, u16 io0,return 0 ; } -static int __devinit snd_msnd_pinnacle_cfg_reset (int cfg) +static int snd_msnd_pinnacle_cfg_reset (int cfg) {int i;
@@ -818,7 +818,7 @@ module_param_array(joystick_io, long, NULL, S_IRUGO);#endif -static int __devinit snd_msnd_isa_match (struct device *pdev,unsigned int i) +static int snd_msnd_isa_match (struct device *pdev,unsigned int i) {if (io[i] ==SNDRV_AUTO_PORT )return 0 ;
@@ -888,7 +888,7 @@ static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i)return 1 ; } -static int __devinit snd_msnd_isa_probe (struct device *pdev,unsigned int idx) +static int snd_msnd_isa_probe (struct device *pdev,unsigned int idx) {int err;struct snd_card *card;
@@ -1081,7 +1081,7 @@ static struct isa_driver snd_msnd_driver = { };#ifdef CONFIG_PNP -static int __devinit snd_msnd_pnp_detect (struct pnp_card_link *pcard, +static int snd_msnd_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {static int idx;
sound/isa/msnd/msnd_pinnacle_mixer.c +1 -1
@@ -302,7 +302,7 @@ DUMMY_VOLUME("Monitor", 0, MSND_MIXER_IMIX), }; -int __devinit snd_msndmix_new (struct snd_card *card) +int snd_msndmix_new (struct snd_card *card) {struct snd_msnd *chip = card->private_data;unsigned int idx;
sound/isa/opl3sa2.c +8 -8
@@ -221,7 +221,7 @@ static void snd_opl3sa2_write(struct snd_opl3sa2 *chip, unsigned char reg, unsigspin_unlock_irqrestore (&chip->reg_lock, flags); } -static int __devinit snd_opl3sa2_detect (struct snd_card *card) +static int snd_opl3sa2_detect (struct snd_card *card) {struct snd_opl3sa2 *chip = card->private_data;unsigned long port;
@@ -496,7 +496,7 @@ static void snd_opl3sa2_master_free(struct snd_kcontrol *kcontrol) chip->master_volume =NULL ; } -static int __devinit snd_opl3sa2_mixer (struct snd_card *card) +static int snd_opl3sa2_mixer (struct snd_card *card) {struct snd_opl3sa2 *chip = card->private_data;struct snd_ctl_elem_id id1, id2;
@@ -596,7 +596,7 @@ static int snd_opl3sa2_resume(struct snd_card *card)#endif /* CONFIG_PM */ #ifdef CONFIG_PNP -static int __devinit snd_opl3sa2_pnp (int dev,struct snd_opl3sa2 *chip, +static int snd_opl3sa2_pnp (int dev,struct snd_opl3sa2 *chip,struct pnp_dev *pdev) {if (pnp_activate_dev (pdev) <0 ) {
@@ -647,7 +647,7 @@ static int snd_opl3sa2_card_new(int dev, struct snd_card **cardp)return 0 ; } -static int __devinit snd_opl3sa2_probe (struct snd_card *card,int dev) +static int snd_opl3sa2_probe (struct snd_card *card,int dev) {int xirq, xdma1, xdma2;struct snd_opl3sa2 *chip;
@@ -721,7 +721,7 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev) }#ifdef CONFIG_PNP -static int __devinit snd_opl3sa2_pnp_detect (struct pnp_dev *pdev, +static int snd_opl3sa2_pnp_detect (struct pnp_dev *pdev,const struct pnp_device_id *id) {static int dev;
@@ -782,7 +782,7 @@ static struct pnp_driver opl3sa2_pnp_driver = {#endif }; -static int __devinit snd_opl3sa2_pnp_cdetect (struct pnp_card_link *pcard, +static int snd_opl3sa2_pnp_cdetect (struct pnp_card_link *pcard,const struct pnp_card_device_id *id) {static int dev;
@@ -850,7 +850,7 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = { };#endif /* CONFIG_PNP */ -static int __devinit snd_opl3sa2_isa_match (struct device *pdev, +static int snd_opl3sa2_isa_match (struct device *pdev,unsigned int dev) {if (!enable[dev])
@@ -878,7 +878,7 @@ static int __devinit snd_opl3sa2_isa_match(struct device *pdev,return 1 ; } -static int __devinit snd_opl3sa2_isa_probe (struct device *pdev, +static int snd_opl3sa2_isa_probe (struct device *pdev,unsigned int dev) {struct snd_card *card;
sound/isa/opti9xx/miro.c +13 -13
@@ -670,7 +670,7 @@ static unsigned char aci_init_values[][2] __devinitdata = { { ACI_SET_MASTER + 1, 0x20 }, }; -static int __devinit snd_set_aci_init_values (struct snd_miro *miro) +static int snd_set_aci_init_values (struct snd_miro *miro) {int idx, error;struct snd_miro_aci *aci = miro->aci;
@@ -713,7 +713,7 @@ static int __devinit snd_set_aci_init_values(struct snd_miro *miro)return 0 ; } -static int __devinit snd_miro_mixer (struct snd_card *card, +static int snd_miro_mixer (struct snd_card *card,struct snd_miro *miro) {unsigned int idx;
@@ -771,7 +771,7 @@ static int __devinit snd_miro_mixer(struct snd_card *card,return 0 ; } -static int __devinit snd_miro_init (struct snd_miro *chip, +static int snd_miro_init (struct snd_miro *chip,unsigned short hardware) {static int opti9xx_mc_size[] = {7 ,7 ,10 ,10 ,2 ,2 ,2 };
@@ -989,7 +989,7 @@ static void snd_miro_proc_read(struct snd_info_entry * entry,snd_iprintf (buffer," preamp : 0x%x\n" , aci->aci_preamp); } -static void __devinit snd_miro_proc_init (struct snd_card *card, +static void snd_miro_proc_init (struct snd_card *card,struct snd_miro *miro) {struct snd_info_entry *entry;
@@ -1002,7 +1002,7 @@ static void __devinit snd_miro_proc_init(struct snd_card *card,* Init */ -static int __devinit snd_miro_configure (struct snd_miro *chip) +static int snd_miro_configure (struct snd_miro *chip) {unsigned char wss_base_bits;unsigned char irq_bits;
@@ -1162,7 +1162,7 @@ __skip_mpu:return 0 ; } -static int __devinit snd_miro_opti_check (struct snd_miro *chip) +static int snd_miro_opti_check (struct snd_miro *chip) {unsigned char value;
@@ -1182,7 +1182,7 @@ static int __devinit snd_miro_opti_check(struct snd_miro *chip)return -ENODEV ; } -static int __devinit snd_card_miro_detect (struct snd_card *card, +static int snd_card_miro_detect (struct snd_card *card,struct snd_miro *chip) {int i, err;
@@ -1200,7 +1200,7 @@ static int __devinit snd_card_miro_detect(struct snd_card *card,return -ENODEV ; } -static int __devinit snd_card_miro_aci_detect (struct snd_card *card, +static int snd_card_miro_aci_detect (struct snd_card *card,struct snd_miro *miro) {unsigned char regval;
@@ -1265,7 +1265,7 @@ static void snd_card_miro_free(struct snd_card *card)release_and_free_resource (miro->res_mc_base); } -static int __devinit snd_miro_probe (struct snd_card *card) +static int snd_miro_probe (struct snd_card *card) {int error;struct snd_miro *miro = card->private_data;
@@ -1386,7 +1386,7 @@ static int __devinit snd_miro_probe(struct snd_card *card)return snd_card_register (card); } -static int __devinit snd_miro_isa_match (struct device *devptr,unsigned int n) +static int snd_miro_isa_match (struct device *devptr,unsigned int n) {#ifdef CONFIG_PNP if (snd_miro_pnp_is_probed)
@@ -1397,7 +1397,7 @@ static int __devinit snd_miro_isa_match(struct device *devptr, unsigned int n)return 1 ; } -static int __devinit snd_miro_isa_probe (struct device *devptr,unsigned int n) +static int snd_miro_isa_probe (struct device *devptr,unsigned int n) {static long possible_ports[] = {0x530 ,0xe80 ,0xf40 ,0x604 ,-1 };static long possible_mpu_ports[] = {0x330 ,0x300 ,0x310 ,0x320 ,-1 };
@@ -1513,7 +1513,7 @@ static struct isa_driver snd_miro_driver = {#ifdef CONFIG_PNP -static int __devinit snd_card_miro_pnp (struct snd_miro *chip, +static int snd_card_miro_pnp (struct snd_miro *chip,struct pnp_card_link *card,const struct pnp_card_device_id *pid) {
@@ -1574,7 +1574,7 @@ static int __devinit snd_card_miro_pnp(struct snd_miro *chip,return 0 ; } -static int __devinit snd_miro_pnp_probe (struct pnp_card_link *pcard, +static int snd_miro_pnp_probe (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {struct snd_card *card;
sound/isa/opti9xx/opti92x-ad1848.c +9 -9
@@ -186,7 +186,7 @@ static char * snd_opti9xx_names[] = { "82C930", "82C931", "82C933" }; -static int __devinit snd_opti9xx_init (struct snd_opti9xx *chip, +static int snd_opti9xx_init (struct snd_opti9xx *chip,unsigned short hardware) {static int opti9xx_mc_size[] = {7 ,7 ,10 ,10 ,2 ,2 ,2 };
@@ -593,7 +593,7 @@ WSS_DOUBLE_TLV("Aux Playback Volume", 0, db_scale_4bit_12db_max), }; -static int __devinit snd_opti93x_mixer (struct snd_wss *chip) +static int snd_opti93x_mixer (struct snd_wss *chip) {struct snd_card *card;unsigned int idx;
@@ -666,7 +666,7 @@ static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id)#endif /* OPTi93X */ -static int __devinit snd_opti9xx_read_check (struct snd_opti9xx *chip) +static int snd_opti9xx_read_check (struct snd_opti9xx *chip) {unsigned char value;#ifdef OPTi93X
@@ -707,7 +707,7 @@ static int __devinit snd_opti9xx_read_check(struct snd_opti9xx *chip)return -ENODEV ; } -static int __devinit snd_card_opti9xx_detect (struct snd_card *card, +static int snd_card_opti9xx_detect (struct snd_card *card,struct snd_opti9xx *chip) {int i, err;
@@ -732,7 +732,7 @@ static int __devinit snd_card_opti9xx_detect(struct snd_card *card, }#ifdef CONFIG_PNP -static int __devinit snd_card_opti9xx_pnp (struct snd_opti9xx *chip, +static int snd_card_opti9xx_pnp (struct snd_opti9xx *chip,struct pnp_card_link *card,const struct pnp_card_device_id *pid) {
@@ -817,7 +817,7 @@ static void snd_card_opti9xx_free(struct snd_card *card) } } -static int __devinit snd_opti9xx_probe (struct snd_card *card) +static int snd_opti9xx_probe (struct snd_card *card) {static long possible_ports[] = {0x530 ,0xe80 ,0xf40 ,0x604 ,-1 };int error;
@@ -952,7 +952,7 @@ static int snd_opti9xx_card_new(struct snd_card **cardp)return 0 ; } -static int __devinit snd_opti9xx_isa_match (struct device *devptr, +static int snd_opti9xx_isa_match (struct device *devptr,unsigned int dev) {#ifdef CONFIG_PNP
@@ -964,7 +964,7 @@ static int __devinit snd_opti9xx_isa_match(struct device *devptr,return 1 ; } -static int __devinit snd_opti9xx_isa_probe (struct device *devptr, +static int snd_opti9xx_isa_probe (struct device *devptr,unsigned int dev) {struct snd_card *card;
@@ -1094,7 +1094,7 @@ static struct isa_driver snd_opti9xx_driver = { };#ifdef CONFIG_PNP -static int __devinit snd_opti9xx_pnp_probe (struct pnp_card_link *pcard, +static int snd_opti9xx_pnp_probe (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {struct snd_card *card;
sound/isa/sb/emu8000.c +11 -22
@@ -131,8 +131,7 @@ snd_emu8000_dma_chan(struct snd_emu8000 *emu, int ch, int mode)/* */ -static void __devinit -snd_emu8000_read_wait (struct snd_emu8000 *emu) +static void snd_emu8000_read_wait (struct snd_emu8000 *emu) {while ((EMU8000_SMALR_READ (emu) &0x80000000 ) !=0 ) {schedule_timeout_interruptible (1 );
@@ -143,8 +142,7 @@ snd_emu8000_read_wait(struct snd_emu8000 *emu)/* */ -static void __devinit -snd_emu8000_write_wait (struct snd_emu8000 *emu) +static void snd_emu8000_write_wait (struct snd_emu8000 *emu) {while ((EMU8000_SMALW_READ (emu) &0x80000000 ) !=0 ) {schedule_timeout_interruptible (1 );
@@ -156,8 +154,7 @@ snd_emu8000_write_wait(struct snd_emu8000 *emu)/* * detect a card at the given port */ -static int __devinit -snd_emu8000_detect (struct snd_emu8000 *emu) +static int snd_emu8000_detect (struct snd_emu8000 *emu) {/* Initialise */ EMU8000_HWCF1_WRITE (emu,0x0059 );
@@ -182,8 +179,7 @@ snd_emu8000_detect(struct snd_emu8000 *emu)/* * intiailize audio channels */ -static void __devinit -init_audio (struct snd_emu8000 *emu) +static void init_audio (struct snd_emu8000 *emu) {int ch;
@@ -223,8 +219,7 @@ init_audio(struct snd_emu8000 *emu)/* * initialize DMA address */ -static void __devinit -init_dma (struct snd_emu8000 *emu) +static void init_dma (struct snd_emu8000 *emu) {EMU8000_SMALR_WRITE (emu,0 );EMU8000_SMARR_WRITE (emu,0 );
@@ -327,8 +322,7 @@ static unsigned short init4[128] /*__devinitdata*/ = {* Taken from the oss driver, not obvious from the doc how this * is meant to work */ -static void __devinit -send_array (struct snd_emu8000 *emu,unsigned short *data,int size) +static void send_array (struct snd_emu8000 *emu,unsigned short *data,int size) {int i;unsigned short *p;
@@ -349,8 +343,7 @@ send_array(struct snd_emu8000 *emu, unsigned short *data, int size)* Send initialization arrays to start up, this just follows the * initialisation sequence in the adip. */ -static void __devinit -init_arrays (struct snd_emu8000 *emu) +static void init_arrays (struct snd_emu8000 *emu) {send_array (emu, init1,ARRAY_SIZE (init1)/4 );
@@ -375,8 +368,7 @@ init_arrays(struct snd_emu8000 *emu)* seems that the only way to do this is to use the one channel and keep * reallocating between read and write. */ -static void __devinit -size_dram (struct snd_emu8000 *emu) +static void size_dram (struct snd_emu8000 *emu) {int i, size, detected_size;
@@ -512,8 +504,7 @@ snd_emu8000_init_fm(struct snd_emu8000 *emu)/* * The main initialization routine. */ -static void __devinit -snd_emu8000_init_hw (struct snd_emu8000 *emu) +static void snd_emu8000_init_hw (struct snd_emu8000 *emu) {int i;
@@ -1031,8 +1022,7 @@ static struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {/* * create and attach mixer elements for WaveTable treble/bass controls */ -static int __devinit -snd_emu8000_create_mixer (struct snd_card *card,struct snd_emu8000 *emu) +static int snd_emu8000_create_mixer (struct snd_card *card,struct snd_emu8000 *emu) {int i, err =0 ;
@@ -1082,8 +1072,7 @@ static int snd_emu8000_dev_free(struct snd_device *device)/* * initialize and register emu8000 synth device. */ -int __devinit -snd_emu8000_new (struct snd_card *card,int index,long port,int seq_ports, +int snd_emu8000_new (struct snd_card *card,int index,long port,int seq_ports,struct snd_seq_device **awe_ret) {struct snd_seq_device *awe;
sound/isa/sb/jazz16.c +5 -5
@@ -78,7 +78,7 @@ static irqreturn_t jazz16_interrupt(int irq, void *chip)return snd_sb8dsp_interrupt (chip); } -static int __devinit jazz16_configure_ports (unsigned long port, +static int jazz16_configure_ports (unsigned long port,unsigned long mpu_port,int idx) {unsigned char val;
@@ -99,7 +99,7 @@ static int __devinit jazz16_configure_ports(unsigned long port,return 0 ; } -static int __devinit jazz16_detect_board (unsigned long port, +static int jazz16_detect_board (unsigned long port,unsigned long mpu_port) {int err;
@@ -156,7 +156,7 @@ err_unmap:return err; } -static int __devinit jazz16_configure_board (struct snd_sb *chip,int mpu_irq) +static int jazz16_configure_board (struct snd_sb *chip,int mpu_irq) {static unsigned char jazz_irq_bits[] = {0 ,0 ,2 ,3 ,0 ,1 ,0 ,4 ,0 ,2 ,5 ,0 ,0 ,0 ,0 ,6 };
@@ -183,7 +183,7 @@ static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq)return 0 ; } -static int __devinit snd_jazz16_match (struct device *devptr,unsigned int dev) +static int snd_jazz16_match (struct device *devptr,unsigned int dev) {if (!enable[dev])return 0 ;
@@ -218,7 +218,7 @@ static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev)return 1 ; } -static int __devinit snd_jazz16_probe (struct device *devptr,unsigned int dev) +static int snd_jazz16_probe (struct device *devptr,unsigned int dev) {struct snd_card *card;struct snd_card_jazz16 *jazz16;
sound/isa/sb/sb16.c +6 -6
@@ -250,7 +250,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_sb16_pnpids);#ifdef CONFIG_PNP -static int __devinit snd_card_sb16_pnp (int dev,struct snd_card_sb16 *acard, +static int snd_card_sb16_pnp (int dev,struct snd_card_sb16 *acard,struct pnp_card_link *card,const struct pnp_card_device_id *id) {
@@ -337,7 +337,7 @@ static int snd_sb16_card_new(int dev, struct snd_card **cardp)return 0 ; } -static int __devinit snd_sb16_probe (struct snd_card *card,int dev) +static int snd_sb16_probe (struct snd_card *card,int dev) {int xirq, xdma8, xdma16;struct snd_sb *chip;
@@ -487,7 +487,7 @@ static int snd_sb16_resume(struct snd_card *card) }#endif -static int __devinit snd_sb16_isa_probe1 (int dev,struct device *pdev) +static int snd_sb16_isa_probe1 (int dev,struct device *pdev) {struct snd_card_sb16 *acard;struct snd_card *card;
@@ -517,12 +517,12 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev) } -static int __devinit snd_sb16_isa_match (struct device *pdev,unsigned int dev) +static int snd_sb16_isa_match (struct device *pdev,unsigned int dev) {return enable[dev] && !is_isapnp_selected (dev); } -static int __devinit snd_sb16_isa_probe (struct device *pdev,unsigned int dev) +static int snd_sb16_isa_probe (struct device *pdev,unsigned int dev) {int err;static int possible_irqs[] = {5 ,9 ,10 ,7 ,-1 };
@@ -604,7 +604,7 @@ static struct isa_driver snd_sb16_isa_driver = {#ifdef CONFIG_PNP -static int __devinit snd_sb16_pnp_detect (struct pnp_card_link *pcard, +static int snd_sb16_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {static int dev;
sound/isa/sb/sb8.c +2 -2
@@ -79,7 +79,7 @@ static void snd_sb8_free(struct snd_card *card)release_and_free_resource (acard->fm_res); } -static int __devinit snd_sb8_match (struct device *pdev,unsigned int dev) +static int snd_sb8_match (struct device *pdev,unsigned int dev) {if (!enable[dev])return 0 ;
@@ -94,7 +94,7 @@ static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev)return 1 ; } -static int __devinit snd_sb8_probe (struct device *pdev,unsigned int dev) +static int snd_sb8_probe (struct device *pdev,unsigned int dev) {struct snd_sb *chip;struct snd_card *card;
sound/isa/sc6000.c +12 -12
@@ -121,7 +121,7 @@ MODULE_PARM_DESC(joystick, "Enable gameport.");/* * sc6000_irq_to_softcfg - Decode irq number into cfg code. */ -static __devinit unsigned char sc6000_irq_to_softcfg (int irq) +static unsigned char sc6000_irq_to_softcfg (int irq) {unsigned char val =0 ;
@@ -150,7 +150,7 @@ static __devinit unsigned char sc6000_irq_to_softcfg(int irq)/* * sc6000_dma_to_softcfg - Decode dma number into cfg code. */ -static __devinit unsigned char sc6000_dma_to_softcfg (int dma) +static unsigned char sc6000_dma_to_softcfg (int dma) {unsigned char val =0 ;
@@ -173,7 +173,7 @@ static __devinit unsigned char sc6000_dma_to_softcfg(int dma)/* * sc6000_mpu_irq_to_softcfg - Decode MPU-401 irq number into cfg code. */ -static __devinit unsigned char sc6000_mpu_irq_to_softcfg (int mpu_irq) +static unsigned char sc6000_mpu_irq_to_softcfg (int mpu_irq) {unsigned char val =0 ;
@@ -242,7 +242,7 @@ static int sc6000_write(char __iomem *vport, int cmd)return -EIO ; } -static int __devinit sc6000_dsp_get_answer (char __iomem *vport,int command, +static int sc6000_dsp_get_answer (char __iomem *vport,int command,char *data,int data_len) {int len =0 ;
@@ -269,7 +269,7 @@ static int __devinit sc6000_dsp_get_answer(char __iomem *vport, int command,return len ? len : -EIO ; } -static int __devinit sc6000_dsp_reset (char __iomem *vport) +static int sc6000_dsp_reset (char __iomem *vport) {iowrite8 (1 , vport +DSP_RESET );udelay (10 );
@@ -281,7 +281,7 @@ static int __devinit sc6000_dsp_reset(char __iomem *vport) }/* detection and initialization */ -static int __devinit sc6000_hw_cfg_write (char __iomem *vport,const int *cfg) +static int sc6000_hw_cfg_write (char __iomem *vport,const int *cfg) {if (sc6000_write (vport,COMMAND_6C ) <0 ) {snd_printk (KERN_WARNING "CMD 0x%x: failed!\n" ,COMMAND_6C );
@@ -345,7 +345,7 @@ static int sc6000_setup_board(char __iomem *vport, int config)return 0 ; } -static int __devinit sc6000_init_mss (char __iomem *vport,int config, +static int sc6000_init_mss (char __iomem *vport,int config,char __iomem *vmss_port,int mss_config) {if (sc6000_write (vport,DSP_INIT_MSS )) {
@@ -364,7 +364,7 @@ static int __devinit sc6000_init_mss(char __iomem *vport, int config,return 0 ; } -static void __devinit sc6000_hw_cfg_encode (char __iomem *vport,int *cfg, +static void sc6000_hw_cfg_encode (char __iomem *vport,int *cfg,long xport,long xmpu,long xmss_port,int joystick) {
@@ -386,7 +386,7 @@ static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg,snd_printd ("hw cfg %x, %x\n" , cfg[0 ], cfg[1 ]); } -static int __devinit sc6000_init_board (char __iomem *vport, +static int sc6000_init_board (char __iomem *vport,char __iomem *vmss_port,int dev) {char answer[15 ];
@@ -467,7 +467,7 @@ static int __devinit sc6000_init_board(char __iomem *vport,return 0 ; } -static int __devinit snd_sc6000_mixer (struct snd_wss *chip) +static int snd_sc6000_mixer (struct snd_wss *chip) {struct snd_card *card = chip->card;struct snd_ctl_elem_id id1, id2;
@@ -502,7 +502,7 @@ static int __devinit snd_sc6000_mixer(struct snd_wss *chip)return 0 ; } -static int __devinit snd_sc6000_match (struct device *devptr,unsigned int dev) +static int snd_sc6000_match (struct device *devptr,unsigned int dev) {if (!enable[dev])return 0 ;
@@ -545,7 +545,7 @@ static int __devinit snd_sc6000_match(struct device *devptr, unsigned int dev)return 1 ; } -static int __devinit snd_sc6000_probe (struct device *devptr,unsigned int dev) +static int snd_sc6000_probe (struct device *devptr,unsigned int dev) {static int possible_irqs[] = {5 ,7 ,9 ,10 ,11 ,-1 };static int possible_dmas[] = {1 ,3 ,0 ,-1 };
sound/isa/sscape.c +9 -9
@@ -683,7 +683,7 @@ static struct snd_kcontrol_new midi_mixer_ctl = {* These IRQs are encoded as bit patterns so that they can be * written to the control registers. */ -static unsigned __devinit get_irq_config (int sscape_type,int irq) +static unsigned get_irq_config (int sscape_type,int irq) {static const int valid_irq[] = {9 ,5 ,7 ,10 };static const int old_irq[] = {9 ,7 ,5 ,15 };
@@ -706,7 +706,7 @@ static unsigned __devinit get_irq_config(int sscape_type, int irq)* Perform certain arcane port-checks to see whether there * is a SoundScape board lurking behind the given ports. */ -static int __devinit detect_sscape (struct soundscape *s,long wss_io) +static int detect_sscape (struct soundscape *s,long wss_io) {unsigned long flags;unsigned d;
@@ -817,7 +817,7 @@ static int mpu401_open(struct snd_mpu401 *mpu)/* * Initialse an MPU-401 subdevice for MIDI support on the SoundScape. */ -static int __devinit create_mpu401 (struct snd_card *card,int devnum, +static int create_mpu401 (struct snd_card *card,int devnum,unsigned long port,int irq) {struct soundscape *sscape =get_card_soundscape (card);
@@ -845,7 +845,7 @@ static int __devinit create_mpu401(struct snd_card *card, int devnum,* try to support at least some of the extra bits by overriding * some of the CS4231 callback. */ -static int __devinit create_ad1845 (struct snd_card *card,unsigned port, +static int create_ad1845 (struct snd_card *card,unsigned port,int irq,int dma1,int dma2) { registerstruct soundscape *sscape =get_card_soundscape (card);
@@ -937,7 +937,7 @@ _error:* Create an ALSA soundcard entry for the SoundScape, using * the given list of port, IRQ and DMA resources. */ -static int __devinit create_sscape (int dev,struct snd_card *card) +static int create_sscape (int dev,struct snd_card *card) {struct soundscape *sscape =get_card_soundscape (card);unsigned dma_cfg;
@@ -1143,7 +1143,7 @@ _release_region: } -static int __devinit snd_sscape_match (struct device *pdev,unsigned int i) +static int snd_sscape_match (struct device *pdev,unsigned int i) {/* * Make sure we were given ALL of the other parameters.
@@ -1163,7 +1163,7 @@ static int __devinit snd_sscape_match(struct device *pdev, unsigned int i)return 1 ; } -static int __devinit snd_sscape_probe (struct device *pdev,unsigned int dev) +static int snd_sscape_probe (struct device *pdev,unsigned int dev) {struct snd_card *card;struct soundscape *sscape;
@@ -1217,7 +1217,7 @@ static struct isa_driver snd_sscape_driver = { };#ifdef CONFIG_PNP -static inline int __devinit get_next_autoindex (int i) +static inline int get_next_autoindex (int i) {while (i <SNDRV_CARDS && port[i] !=SNDRV_AUTO_PORT ) ++i;
@@ -1225,7 +1225,7 @@ static inline int __devinit get_next_autoindex(int i) } -static int __devinit sscape_pnp_detect (struct pnp_card_link *pcard, +static int sscape_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {static int idx =0 ;
sound/isa/wavefront/wavefront.c +8 -13
@@ -98,8 +98,7 @@ static struct pnp_card_device_id snd_wavefront_pnpids[] = {MODULE_DEVICE_TABLE (pnp_card, snd_wavefront_pnpids); -static int __devinit -snd_wavefront_pnp (int dev,snd_wavefront_card_t *acard,struct pnp_card_link *card, +static int snd_wavefront_pnp (int dev,snd_wavefront_card_t *acard,struct pnp_card_link *card,const struct pnp_card_device_id *id) {struct pnp_dev *pdev;
@@ -231,8 +230,7 @@ static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct snd_hwdep *__devinit -snd_wavefront_new_synth (struct snd_card *card, +static struct snd_hwdep *snd_wavefront_new_synth (struct snd_card *card,int hw_dev,snd_wavefront_card_t *acard) {
@@ -257,8 +255,7 @@ snd_wavefront_new_synth (struct snd_card *card,return wavefront_synth; } -static struct snd_hwdep *__devinit -snd_wavefront_new_fx (struct snd_card *card, +static struct snd_hwdep *snd_wavefront_new_fx (struct snd_card *card,int hw_dev,snd_wavefront_card_t *acard,unsigned long port)
@@ -284,8 +281,7 @@ snd_wavefront_new_fx (struct snd_card *card,static snd_wavefront_mpu_id internal_id = internal_mpu;static snd_wavefront_mpu_id external_id = external_mpu; -static struct snd_rawmidi *__devinit -snd_wavefront_new_midi (struct snd_card *card, +static struct snd_rawmidi *snd_wavefront_new_midi (struct snd_card *card, int midi_dev, snd_wavefront_card_t *acard, unsigned long port,
@@ -361,8 +357,7 @@ static int snd_wavefront_card_new(int dev, struct snd_card **cardp)return 0 ; } -static int __devinit -snd_wavefront_probe (struct snd_card *card,int dev) +static int snd_wavefront_probe (struct snd_card *card,int dev) {snd_wavefront_card_t *acard = card->private_data;struct snd_wss *chip;
@@ -541,7 +536,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)return snd_card_register (card); } -static int __devinit snd_wavefront_isa_match (struct device *pdev, +static int snd_wavefront_isa_match (struct device *pdev,unsigned int dev) {if (!enable[dev])
@@ -561,7 +556,7 @@ static int __devinit snd_wavefront_isa_match(struct device *pdev,return 1 ; } -static int __devinit snd_wavefront_isa_probe (struct device *pdev, +static int snd_wavefront_isa_probe (struct device *pdev,unsigned int dev) {struct snd_card *card;
@@ -602,7 +597,7 @@ static struct isa_driver snd_wavefront_driver = {#ifdef CONFIG_PNP -static int __devinit snd_wavefront_pnp_detect (struct pnp_card_link *pcard, +static int snd_wavefront_pnp_detect (struct pnp_card_link *pcard,const struct pnp_card_device_id *pid) {static int dev;
sound/isa/wavefront/wavefront_fx.c +1 -2
@@ -240,8 +240,7 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,that outputs it. */ -int __devinit -snd_wavefront_fx_start (snd_wavefront_t *dev) +int snd_wavefront_fx_start (snd_wavefront_t *dev) {unsigned int i;int err;
sound/isa/wavefront/wavefront_midi.c +1 -2
@@ -481,8 +481,7 @@ snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *card)spin_unlock_irqrestore (&card->wavefront.midi.virtual, flags); } -int __devinit -snd_wavefront_midi_start (snd_wavefront_card_t *card) +int snd_wavefront_midi_start (snd_wavefront_card_t *card) {int ok, i;
sound/isa/wavefront/wavefront_synth.c +7 -14
@@ -1739,8 +1739,7 @@ snd_wavefront_internal_interrupt (snd_wavefront_card_t *card)7 Unused */ -static int __devinit -snd_wavefront_interrupt_bits (int irq) +static int snd_wavefront_interrupt_bits (int irq) {int bits;
@@ -1767,8 +1766,7 @@ snd_wavefront_interrupt_bits (int irq)return bits; } -static void __devinit -wavefront_should_cause_interrupt (snd_wavefront_t *dev, +static void wavefront_should_cause_interrupt (snd_wavefront_t *dev,int val,int port,unsigned long timeout) {
@@ -1786,8 +1784,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev, } } -static int __devinit -wavefront_reset_to_cleanliness (snd_wavefront_t *dev) +static int wavefront_reset_to_cleanliness (snd_wavefront_t *dev) {int bits;
@@ -1937,8 +1934,7 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)return (1 ); } -static int __devinit -wavefront_download_firmware (snd_wavefront_t *dev,char *path) +static int wavefront_download_firmware (snd_wavefront_t *dev,char *path) {const unsigned char *buf;
@@ -2010,8 +2006,7 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path) } -static int __devinit -wavefront_do_reset (snd_wavefront_t *dev) +static int wavefront_do_reset (snd_wavefront_t *dev) {char voices[1 ];
@@ -2099,8 +2094,7 @@ wavefront_do_reset (snd_wavefront_t *dev)return 1 ; } -int __devinit -snd_wavefront_start (snd_wavefront_t *dev) +int snd_wavefront_start (snd_wavefront_t *dev) {int samples_are_from_rom;
@@ -2141,8 +2135,7 @@ snd_wavefront_start (snd_wavefront_t *dev)return (0 ); } -int __devinit -snd_wavefront_detect (snd_wavefront_card_t *card) +int snd_wavefront_detect (snd_wavefront_card_t *card) {unsigned char rbuf[4 ], wbuf[4 ];
sound/mips/au1x00.c +2 -4
@@ -439,8 +439,7 @@ static struct snd_pcm_ops snd_card_au1000_capture_ops = { .pointer = snd_au1000_pointer, }; -static int __devinit -snd_au1000_pcm_new (struct snd_au1000 *au1000) +static int snd_au1000_pcm_new (struct snd_au1000 *au1000) {struct snd_pcm *pcm;int err;
@@ -552,8 +551,7 @@ get the interrupt driven case to work efficiently */spin_unlock (&au1000->ac97_lock); } -static int __devinit -snd_au1000_ac97_new (struct snd_au1000 *au1000) +static int snd_au1000_ac97_new (struct snd_au1000 *au1000) {int err;struct snd_ac97_bus *pbus;
sound/mips/hal2.c +3 -3
@@ -280,7 +280,7 @@ static struct snd_kcontrol_new hal2_ctrl_mic __devinitdata = { .put = hal2_gain_put, }; -static int __devinit hal2_mixer_create (struct snd_hal2 *hal2) +static int hal2_mixer_create (struct snd_hal2 *hal2) {int err;
@@ -733,7 +733,7 @@ static struct snd_pcm_ops hal2_capture_ops = { .ack = hal2_capture_ack, }; -static int __devinit hal2_pcm_create (struct snd_hal2 *hal2) +static int hal2_pcm_create (struct snd_hal2 *hal2) {struct snd_pcm *pcm;int err;
@@ -874,7 +874,7 @@ static int hal2_create(struct snd_card *card, struct snd_hal2 **rchip)return 0 ; } -static int __devinit hal2_probe (struct platform_device *pdev) +static int hal2_probe (struct platform_device *pdev) {struct snd_card *card;struct snd_hal2 *chip;
sound/mips/sgio2audio.c +4 -4
@@ -317,7 +317,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_mic __devinitdata = { }; -static int __devinit snd_sgio2audio_new_mixer (struct snd_sgio2audio *chip) +static int snd_sgio2audio_new_mixer (struct snd_sgio2audio *chip) {int err;
@@ -726,7 +726,7 @@ static struct snd_pcm_ops snd_sgio2audio_capture_ops = {*/ /* create a pcm device */ -static int __devinit snd_sgio2audio_new_pcm (struct snd_sgio2audio *chip) +static int snd_sgio2audio_new_pcm (struct snd_sgio2audio *chip) {struct snd_pcm *pcm;int err;
@@ -834,7 +834,7 @@ static struct snd_device_ops ops = { .dev_free = snd_sgio2audio_dev_free, }; -static int __devinit snd_sgio2audio_create (struct snd_card *card, +static int snd_sgio2audio_create (struct snd_card *card,struct snd_sgio2audio **rchip) {struct snd_sgio2audio *chip;
@@ -914,7 +914,7 @@ static int __devinit snd_sgio2audio_create(struct snd_card *card,return 0 ; } -static int __devinit snd_sgio2audio_probe (struct platform_device *pdev) +static int snd_sgio2audio_probe (struct platform_device *pdev) {struct snd_card *card;struct snd_sgio2audio *chip;
sound/oss/kahlua.c +2 -2
@@ -43,7 +43,7 @@* not real hardware. */ -static u8 __devinit mixer_read (unsigned long io,u8 reg) +static u8 mixer_read (unsigned long io,u8 reg) {outb (reg, io +4 );udelay (20 );
@@ -52,7 +52,7 @@ static u8 __devinit mixer_read(unsigned long io, u8 reg)return reg; } -static int __devinit probe_one (struct pci_dev *pdev,const struct pci_device_id *ent) +static int probe_one (struct pci_dev *pdev,const struct pci_device_id *ent) {struct address_info *hw_config;unsigned long base;
sound/oss/swarm_cs4297a.c +1 -1
@@ -46,7 +46,7 @@* libOSSm.so) * 10/11/00 trw - modified for 2.4.0-test9 kernel enhancements (NR_MAP removal) * 11/03/00 trw - fixed interrupt loss/stutter, added debug. -* 11/10/00 bkz - added __devinit to cs4297a_hw_init() +* 11/10/00 bkz - added to cs4297a_hw_init() * 11/10/00 trw - fixed SMP and capture spinlock hang. * 12/04/00 trw - cleaned up CSDEBUG flags and added "defaultorder" moduleparm. * 12/05/00 trw - fixed polling (myth2), and added underrun swptr fix.
sound/parisc/harmony.c +4 -8
@@ -856,8 +856,7 @@ static struct snd_kcontrol_new snd_harmony_controls[] = { HARMONY_GAIN_HE_SHIFT, 1, 0), }; -static void __devinit -snd_harmony_mixer_reset (struct snd_harmony *h) +static void snd_harmony_mixer_reset (struct snd_harmony *h) {harmony_mute (h);harmony_reset (h);
@@ -865,8 +864,7 @@ snd_harmony_mixer_reset(struct snd_harmony *h)harmony_unmute (h); } -static int __devinit -snd_harmony_mixer_init (struct snd_harmony *h) +static int snd_harmony_mixer_init (struct snd_harmony *h) {struct snd_card *card;int idx, err;
@@ -915,8 +913,7 @@ snd_harmony_dev_free(struct snd_device *dev)return snd_harmony_free (h); } -static int __devinit -snd_harmony_create (struct snd_card *card, +static int snd_harmony_create (struct snd_card *card,struct parisc_device *padev,struct snd_harmony **rchip) {
@@ -972,8 +969,7 @@ free_and_ret:return err; } -static int __devinit -snd_harmony_probe (struct parisc_device *padev) +static int snd_harmony_probe (struct parisc_device *padev) {int err;struct snd_card *card;
sound/pci/ad1889.c +7 -14
@@ -624,8 +624,7 @@ snd_ad1889_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static int __devinit -snd_ad1889_pcm_init (struct snd_ad1889 *chip,int device,struct snd_pcm **rpcm) +static int snd_ad1889_pcm_init (struct snd_ad1889 *chip,int device,struct snd_pcm **rpcm) {int err;struct snd_pcm *pcm;
@@ -747,8 +746,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffesnd_iprintf (buffer,"Resampler samplerate: %u Hz\n" , reg); } -static void __devinit -snd_ad1889_proc_init (struct snd_ad1889 *chip) +static void snd_ad1889_proc_init (struct snd_ad1889 *chip) {struct snd_info_entry *entry;
@@ -767,8 +765,7 @@ static struct ac97_quirk ac97_quirks[] = { { }/* terminator */ }; -static void __devinit -snd_ad1889_ac97_xinit (struct snd_ad1889 *chip) +static void snd_ad1889_ac97_xinit (struct snd_ad1889 *chip) {u16 reg;
@@ -805,8 +802,7 @@ snd_ad1889_ac97_free(struct snd_ac97 *ac97) chip->ac97 =NULL ; } -static int __devinit -snd_ad1889_ac97_init (struct snd_ad1889 *chip,const char *quirk_override) +static int snd_ad1889_ac97_init (struct snd_ad1889 *chip,const char *quirk_override) {int err;struct snd_ac97_template ac97;
@@ -878,8 +874,7 @@ snd_ad1889_dev_free(struct snd_device *device)return snd_ad1889_free (chip); } -static int __devinit -snd_ad1889_init (struct snd_ad1889 *chip) +static int snd_ad1889_init (struct snd_ad1889 *chip) {ad1889_writew (chip,AD_DS_CCS ,AD_DS_CCS_CLKEN );/* turn on clock */ ad1889_readw (chip,AD_DS_CCS );/* flush posted write */
@@ -892,8 +887,7 @@ snd_ad1889_init(struct snd_ad1889 *chip)return 0 ; } -static int __devinit -snd_ad1889_create (struct snd_card *card, +static int snd_ad1889_create (struct snd_card *card,struct pci_dev *pci,struct snd_ad1889 **rchip) {
@@ -978,8 +972,7 @@ free_and_ret:return err; } -static int __devinit -snd_ad1889_probe (struct pci_dev *pci, +static int snd_ad1889_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {int err;
sound/pci/ak4531_codec.c +2 -3
@@ -383,7 +383,7 @@ static u8 snd_ak4531_initial_map[0x19 + 1] = { 0x01 /* 19: Mic Amp Setup */ }; -int __devinit snd_ak4531_mixer (struct snd_card *card, +int snd_ak4531_mixer (struct snd_card *card,struct snd_ak4531 *_ak4531,struct snd_ak4531 **rak4531) {
@@ -483,8 +483,7 @@ static void snd_ak4531_proc_read(struct snd_info_entry *entry, ak4531->regs[AK4531_MIC_GAIN] & 1 ? "+30dB" : "+0dB"); } -static void __devinit -snd_ak4531_proc_init (struct snd_card *card,struct snd_ak4531 *ak4531) +static void snd_ak4531_proc_init (struct snd_card *card,struct snd_ak4531 *ak4531) {struct snd_info_entry *entry;
sound/pci/ali5451/ali5451.c +7 -7
@@ -1678,7 +1678,7 @@ static void snd_ali_pcm_free(struct snd_pcm *pcm) } -static int __devinit snd_ali_pcm (struct snd_ali * codec,int device, +static int snd_ali_pcm (struct snd_ali * codec,int device,struct ali_pcm_description *desc) {struct snd_pcm *pcm;
@@ -1727,7 +1727,7 @@ static struct ali_pcm_description ali_pcms[] = { } }; -static int __devinit snd_ali_build_pcms (struct snd_ali *codec) +static int snd_ali_build_pcms (struct snd_ali *codec) {int i, err;for (i =0 ; i < codec->num_of_codecs && i <ARRAY_SIZE (ali_pcms); i++) {
@@ -1842,7 +1842,7 @@ static struct snd_kcontrol_new snd_ali5451_mixer_spdif[] __devinitdata = { ALI5451_SPDIF(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, 2) }; -static int __devinit snd_ali_mixer (struct snd_ali * codec) +static int snd_ali_mixer (struct snd_ali * codec) {struct snd_ac97_template ac97;unsigned int idx;
@@ -2079,14 +2079,14 @@ static void snd_ali_proc_read(struct snd_info_entry *entry,snd_iprintf (buf,"%02x: %08x\n" , i,inl (ALI_REG (codec, i))); } -static void __devinit snd_ali_proc_init (struct snd_ali *codec) +static void snd_ali_proc_init (struct snd_ali *codec) {struct snd_info_entry *entry;if (!snd_card_proc_new (codec->card,"ali5451" , &entry))snd_info_set_text_ops (entry, codec, snd_ali_proc_read); } -static int __devinit snd_ali_resources (struct snd_ali *codec) +static int snd_ali_resources (struct snd_ali *codec) {int err;
@@ -2112,7 +2112,7 @@ static int snd_ali_dev_free(struct snd_device *device)return 0 ; } -static int __devinit snd_ali_create(struct snd_card *card, +static int snd_ali_create(struct snd_card *card, struct pci_dev *pci, int pcm_streams, int spdif_support,
@@ -2246,7 +2246,7 @@ static int __devinit snd_ali_create(struct snd_card *card,return 0 ; } -static int __devinit snd_ali_probe (struct pci_dev *pci, +static int snd_ali_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {struct snd_card *card;
sound/pci/als300.c +3 -3
@@ -622,7 +622,7 @@ static struct snd_pcm_ops snd_als300_capture_ops = { .pointer = snd_als300_pointer, }; -static int __devinit snd_als300_new_pcm (struct snd_als300 *chip) +static int snd_als300_new_pcm (struct snd_als300 *chip) {struct snd_pcm *pcm;int err;
@@ -683,7 +683,7 @@ static void snd_als300_init(struct snd_als300 *chip)snd_als300_dbgcallleave (); } -static int __devinit snd_als300_create (struct snd_card *card, +static int snd_als300_create (struct snd_card *card,struct pci_dev *pci,int chip_type,struct snd_als300 **rchip) {
@@ -815,7 +815,7 @@ static SIMPLE_DEV_PM_OPS(snd_als300_pm, snd_als300_suspend, snd_als300_resume);#define SND_ALS300_PM_OPS NULL#endif -static int __devinit snd_als300_probe (struct pci_dev *pci, +static int snd_als300_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {static int dev;
sound/pci/als4000.c +3 -3
@@ -694,7 +694,7 @@ static struct snd_pcm_ops snd_als4000_capture_ops = { .pointer = snd_als4000_capture_pointer }; -static int __devinit snd_als4000_pcm (struct snd_sb *chip,int device) +static int snd_als4000_pcm (struct snd_sb *chip,int device) {struct snd_pcm *pcm;int err;
@@ -770,7 +770,7 @@ static void snd_als4000_configure(struct snd_sb *chip) }#ifdef SUPPORT_JOYSTICK -static int __devinit snd_als4000_create_gameport (struct snd_card_als4000 *acard,int dev) +static int snd_als4000_create_gameport (struct snd_card_als4000 *acard,int dev) {struct gameport *gp;struct resource *r;
@@ -847,7 +847,7 @@ static void snd_card_als4000_free( struct snd_card *card )pci_disable_device (acard->pci); } -static int __devinit snd_card_als4000_probe (struct pci_dev *pci, +static int snd_card_als4000_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {static int dev;
sound/pci/asihpi/asihpi.c +14 -14
@@ -1235,7 +1235,7 @@ static struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = { .pointer = snd_card_asihpi_capture_pointer, }; -static int __devinit snd_card_asihpi_pcm_new ( +static int snd_card_asihpi_pcm_new (struct snd_card_asihpi *asihpi,int device) {struct snd_pcm *pcm;
@@ -1497,7 +1497,7 @@ static int snd_asihpi_volume_mute_put(struct snd_kcontrol *kcontrol,return change; } -static int __devinit snd_asihpi_volume_add (struct snd_card_asihpi *asihpi, +static int snd_asihpi_volume_add (struct snd_card_asihpi *asihpi,struct hpi_control *hpi_ctl) {struct snd_card *card = asihpi->card;
@@ -1593,7 +1593,7 @@ static int snd_asihpi_level_put(struct snd_kcontrol *kcontrol, static const DECLARE_TLV_DB_SCALE(db_scale_level, -1000, 100, 0); -static int __devinit snd_asihpi_level_add (struct snd_card_asihpi *asihpi, +static int snd_asihpi_level_add (struct snd_card_asihpi *asihpi,struct hpi_control *hpi_ctl) {struct snd_card *card = asihpi->card;
@@ -1715,7 +1715,7 @@ static int snd_asihpi_aesebu_rxstatus_get(struct snd_kcontrol *kcontrol,return 0 ; } -static int __devinit snd_asihpi_aesebu_rx_add (struct snd_card_asihpi *asihpi, +static int snd_asihpi_aesebu_rx_add (struct snd_card_asihpi *asihpi,struct hpi_control *hpi_ctl) {struct snd_card *card = asihpi->card;
@@ -1753,7 +1753,7 @@ static int snd_asihpi_aesebu_tx_format_put(struct snd_kcontrol *kcontrol, } -static int __devinit snd_asihpi_aesebu_tx_add (struct snd_card_asihpi *asihpi, +static int snd_asihpi_aesebu_tx_add (struct snd_card_asihpi *asihpi,struct hpi_control *hpi_ctl) {struct snd_card *card = asihpi->card;
@@ -1996,7 +1996,7 @@ static int snd_asihpi_tuner_freq_put(struct snd_kcontrol *kcontrol, }/* Tuner control group initializer */ -static int __devinit snd_asihpi_tuner_add (struct snd_card_asihpi *asihpi, +static int snd_asihpi_tuner_add (struct snd_card_asihpi *asihpi,struct hpi_control *hpi_ctl) {struct snd_card *card = asihpi->card;
@@ -2100,7 +2100,7 @@ static int snd_asihpi_meter_get(struct snd_kcontrol *kcontrol,return 0 ; } -static int __devinit snd_asihpi_meter_add (struct snd_card_asihpi *asihpi, +static int snd_asihpi_meter_add (struct snd_card_asihpi *asihpi,struct hpi_control *hpi_ctl,int subidx) {struct snd_card *card = asihpi->card;
@@ -2214,7 +2214,7 @@ static int snd_asihpi_mux_put(struct snd_kcontrol *kcontrol, } -static int __devinit snd_asihpi_mux_add (struct snd_card_asihpi *asihpi, +static int snd_asihpi_mux_add (struct snd_card_asihpi *asihpi,struct hpi_control *hpi_ctl) {struct snd_card *card = asihpi->card;
@@ -2303,7 +2303,7 @@ static int snd_asihpi_cmode_put(struct snd_kcontrol *kcontrol, } -static int __devinit snd_asihpi_cmode_add (struct snd_card_asihpi *asihpi, +static int snd_asihpi_cmode_add (struct snd_card_asihpi *asihpi,struct hpi_control *hpi_ctl) {struct snd_card *card = asihpi->card;
@@ -2471,7 +2471,7 @@ static int snd_asihpi_clkrate_get(struct snd_kcontrol *kcontrol,return 0 ; } -static int __devinit snd_asihpi_sampleclock_add (struct snd_card_asihpi *asihpi, +static int snd_asihpi_sampleclock_add (struct snd_card_asihpi *asihpi,struct hpi_control *hpi_ctl) {struct snd_card *card = asihpi->card;
@@ -2548,7 +2548,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,Mixer ------------------------------------------------------------*/ -static int __devinit snd_card_asihpi_mixer_new (struct snd_card_asihpi *asihpi) +static int snd_card_asihpi_mixer_new (struct snd_card_asihpi *asihpi) {struct snd_card *card = asihpi->card;unsigned int idx =0 ;
@@ -2722,7 +2722,7 @@ snd_asihpi_proc_read(struct snd_info_entry *entry, } } -static void __devinit snd_asihpi_proc_init (struct snd_card_asihpi *asihpi) +static void snd_asihpi_proc_init (struct snd_card_asihpi *asihpi) {struct snd_info_entry *entry;
@@ -2764,7 +2764,7 @@ static int snd_asihpi_hpi_ioctl(struct snd_hwdep *hw, struct file *file,/* results in /dev/snd/hwC#D0 file for each card with index # also /proc/asound/hwdep will contain '#-00: asihpi (HPI) for each card' */ -static int __devinit snd_asihpi_hpi_new (struct snd_card_asihpi *asihpi, +static int snd_asihpi_hpi_new (struct snd_card_asihpi *asihpi,int device,struct snd_hwdep **rhwdep) {struct snd_hwdep *hw;
@@ -2789,7 +2789,7 @@ static int __devinit snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi,/*------------------------------------------------------------ CARD ------------------------------------------------------------*/ -static int __devinit snd_asihpi_probe (struct pci_dev *pci_dev, +static int snd_asihpi_probe (struct pci_dev *pci_dev,const struct pci_device_id *pci_id) {int err;
sound/pci/asihpi/hpioctl.c +1 -1
@@ -307,7 +307,7 @@ out:return err; } -int __devinit asihpi_adapter_probe (struct pci_dev *pci_dev, +int asihpi_adapter_probe (struct pci_dev *pci_dev,const struct pci_device_id *pci_id) {int idx, nm;
sound/pci/asihpi/hpioctl.h +1 -1
@@ -19,7 +19,7 @@Linux HPI ioctl, and shared module init functions *******************************************************************************/ -int __devinit asihpi_adapter_probe (struct pci_dev *pci_dev, +int asihpi_adapter_probe (struct pci_dev *pci_dev,const struct pci_device_id *pci_id); void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev);void __init asihpi_init (void );
sound/pci/atiixp.c +7 -7
@@ -561,7 +561,7 @@ static int snd_atiixp_aclink_down(struct atiixp *chip) ATI_REG_ISR_CODEC2_NOT_READY)#define CODEC_CHECK_BITS (ALL_CODEC_NOT_READY|ATI_REG_ISR_NEW_FRAME) -static int __devinit ac97_probing_bugs (struct pci_dev *pci) +static int ac97_probing_bugs (struct pci_dev *pci) {const struct snd_pci_quirk *q;
@@ -575,7 +575,7 @@ static int __devinit ac97_probing_bugs(struct pci_dev *pci)return -1 ; } -static int __devinit snd_atiixp_codec_detect (struct atiixp *chip) +static int snd_atiixp_codec_detect (struct atiixp *chip) {int timeout;
@@ -1247,7 +1247,7 @@ static struct atiixp_dma_ops snd_atiixp_spdif_dma_ops = { }; -static int __devinit snd_atiixp_pcm_new (struct atiixp *chip) +static int snd_atiixp_pcm_new (struct atiixp *chip) {struct snd_pcm *pcm;struct snd_pcm_chmap *chmap;
@@ -1412,7 +1412,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { { }/* terminator */ }; -static int __devinit snd_atiixp_mixer_new (struct atiixp *chip,int clock, +static int snd_atiixp_mixer_new (struct atiixp *chip,int clock,const char *quirk_override) {struct snd_ac97_bus *pbus;
@@ -1560,7 +1560,7 @@ static void snd_atiixp_proc_read(struct snd_info_entry *entry,snd_iprintf (buffer,"%02x: %08x\n" , i,readl (chip->remap_addr + i)); } -static void __devinit snd_atiixp_proc_init (struct atiixp *chip) +static void snd_atiixp_proc_init (struct atiixp *chip) {struct snd_info_entry *entry;
@@ -1602,7 +1602,7 @@ static int snd_atiixp_dev_free(struct snd_device *device)/* * constructor for chip instance */ -static int __devinit snd_atiixp_create (struct snd_card *card, +static int snd_atiixp_create (struct snd_card *card,struct pci_dev *pci,struct atiixp **r_chip) {
@@ -1661,7 +1661,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card, } -static int __devinit snd_atiixp_probe (struct pci_dev *pci, +static int snd_atiixp_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {struct snd_card *card;
sound/pci/atiixp_modem.c +5 -5
@@ -988,7 +988,7 @@ static struct atiixp_dma_ops snd_atiixp_capture_dma_ops = { .flush_dma = atiixp_in_flush_dma, }; -static int __devinit snd_atiixp_pcm_new (struct atiixp_modem *chip) +static int snd_atiixp_pcm_new (struct atiixp_modem *chip) {struct snd_pcm *pcm;int err;
@@ -1061,7 +1061,7 @@ static irqreturn_t snd_atiixp_interrupt(int irq, void *dev_id)* ac97 mixer section */ -static int __devinit snd_atiixp_mixer_new (struct atiixp_modem *chip,int clock) +static int snd_atiixp_mixer_new (struct atiixp_modem *chip,int clock) {struct snd_ac97_bus *pbus;struct snd_ac97_template ac97;
@@ -1186,7 +1186,7 @@ static void snd_atiixp_proc_read(struct snd_info_entry *entry,snd_iprintf (buffer,"%02x: %08x\n" , i,readl (chip->remap_addr + i)); } -static void __devinit snd_atiixp_proc_init (struct atiixp_modem *chip) +static void snd_atiixp_proc_init (struct atiixp_modem *chip) {struct snd_info_entry *entry;
@@ -1228,7 +1228,7 @@ static int snd_atiixp_dev_free(struct snd_device *device)/* * constructor for chip instance */ -static int __devinit snd_atiixp_create (struct snd_card *card, +static int snd_atiixp_create (struct snd_card *card,struct pci_dev *pci,struct atiixp_modem **r_chip) {
@@ -1287,7 +1287,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card, } -static int __devinit snd_atiixp_probe (struct pci_dev *pci, +static int snd_atiixp_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {struct snd_card *card;
sound/pci/au88x0/au88x0.c +3 -5
@@ -78,7 +78,7 @@ static void vortex_fix_agp_bridge(struct pci_dev *via) } } -static void __devinit snd_vortex_workaround (struct pci_dev *vortex,int fix) +static void snd_vortex_workaround (struct pci_dev *vortex,int fix) {struct pci_dev *via =NULL ;
@@ -137,8 +137,7 @@ static int snd_vortex_dev_free(struct snd_device *device)// chip-specific constructor // (see "Management of Cards and Components") -static int __devinit -snd_vortex_create (struct snd_card *card,struct pci_dev *pci,vortex_t ** rchip) +static int snd_vortex_create (struct snd_card *card,struct pci_dev *pci,vortex_t ** rchip) {vortex_t *chip;int err;
@@ -234,8 +233,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip) }// constructor -- see "Constructor" sub-section -static int __devinit -snd_vortex_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) +static int snd_vortex_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {static int dev;struct snd_card *card;
sound/pci/au88x0/au88x0_a3d.c +2 -2
@@ -594,7 +594,7 @@ static int Vort3DRend_Initialize(vortex_t * v, unsigned short mode)static int vortex_a3d_register_controls (vortex_t * vortex);static void vortex_a3d_unregister_controls (vortex_t * vortex);/* A3D base support init/shudown */ -static void __devinit vortex_Vort3D_enable (vortex_t * v) +static void vortex_Vort3D_enable (vortex_t * v) {int i;
@@ -855,7 +855,7 @@ static struct snd_kcontrol_new vortex_a3d_kcontrol __devinitdata = { };/* Control (un)registration. */ -static int __devinit vortex_a3d_register_controls (vortex_t * vortex) +static int vortex_a3d_register_controls (vortex_t * vortex) {struct snd_kcontrol *kcontrol;int err, i;
sound/pci/au88x0/au88x0_core.c +1 -1
@@ -2680,7 +2680,7 @@ static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)/* Initialization */ -static int __devinit vortex_core_init (vortex_t * vortex) +static int vortex_core_init (vortex_t * vortex) {printk (KERN_INFO "Vortex: init.... " );
sound/pci/au88x0/au88x0_eq.c +1 -1
@@ -877,7 +877,7 @@ static char *EqBandLabels[10] __devinitdata = { };/* ALSA driver entry points. Init and exit. */ -static int __devinit vortex_eq_init (vortex_t * vortex) +static int vortex_eq_init (vortex_t * vortex) {struct snd_kcontrol *kcontrol;int err, i;
sound/pci/au88x0/au88x0_game.c +1 -1
@@ -92,7 +92,7 @@ static int vortex_game_open(struct gameport *gameport, int mode)return 0 ; } -static int __devinit vortex_gameport_register (vortex_t * vortex) +static int vortex_gameport_register (vortex_t * vortex) {struct gameport *gp;
sound/pci/au88x0/au88x0_mixer.c +1 -1
@@ -19,7 +19,7 @@ static int remove_ctl(struct snd_card *card, const char *name)return snd_ctl_remove_id (card, &id); } -static int __devinit snd_vortex_mixer (vortex_t * vortex) +static int snd_vortex_mixer (vortex_t * vortex) {struct snd_ac97_bus *pbus;struct snd_ac97_template ac97;
sound/pci/au88x0/au88x0_mpu401.c +1 -1
@@ -41,7 +41,7 @@#define MPU401_ENTER_UART 0x3f#define MPU401_ACK 0xfe -static int __devinit snd_vortex_midi (vortex_t * vortex) +static int snd_vortex_midi (vortex_t * vortex) {struct snd_rawmidi *rmidi;int temp, mode;
sound/pci/au88x0/au88x0_pcm.c +1 -1
@@ -611,7 +611,7 @@ static struct snd_kcontrol_new snd_vortex_pcm_vol __devinitdata = { };/* create a pcm device */ -static int __devinit snd_vortex_new_pcm (vortex_t *chip,int idx,int nr) +static int snd_vortex_new_pcm (vortex_t *chip,int idx,int nr) {struct snd_pcm *pcm;struct snd_kcontrol *kctl;
sound/pci/aw2/aw2-alsa.c +6 -6
@@ -113,9 +113,9 @@ struct aw2 {* FUNCTION DECLARATIONS ********************************/ static int snd_aw2_dev_free (struct snd_device *device); -static int __devinit snd_aw2_create (struct snd_card *card, +static int snd_aw2_create (struct snd_card *card,struct pci_dev *pci,struct aw2 **rchip); -static int __devinit snd_aw2_probe (struct pci_dev *pci, +static int snd_aw2_probe (struct pci_dev *pci,const struct pci_device_id *pci_id); static void __devexit snd_aw2_remove(struct pci_dev *pci);static int snd_aw2_pcm_playback_open (struct snd_pcm_substream *substream);
@@ -135,7 +135,7 @@ static snd_pcm_uframes_t snd_aw2_pcm_pointer_playback(struct snd_pcm_substream *substream);static snd_pcm_uframes_t snd_aw2_pcm_pointer_capture (struct snd_pcm_substream *substream); -static int __devinit snd_aw2_new_pcm (struct aw2 *chip); +static int snd_aw2_new_pcm (struct aw2 *chip);static int snd_aw2_control_switch_capture_info (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_info *uinfo);
@@ -242,7 +242,7 @@ static int snd_aw2_dev_free(struct snd_device *device) }/* chip-specific constructor */ -static int __devinit snd_aw2_create (struct snd_card *card, +static int snd_aw2_create (struct snd_card *card,struct pci_dev *pci,struct aw2 **rchip) {struct aw2 *chip;
@@ -332,7 +332,7 @@ static int __devinit snd_aw2_create(struct snd_card *card, }/* constructor */ -static int __devinit snd_aw2_probe (struct pci_dev *pci, +static int snd_aw2_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {static int dev;
@@ -591,7 +591,7 @@ static snd_pcm_uframes_t snd_aw2_pcm_pointer_capture(struct snd_pcm_substream }/* create a pcm device */ -static int __devinit snd_aw2_new_pcm (struct aw2 *chip) +static int snd_aw2_new_pcm (struct aw2 *chip) {struct snd_pcm *pcm_playback_ana;struct snd_pcm *pcm_playback_num;
sound/pci/azt3328.c +7 -14
@@ -817,8 +817,7 @@ snd_azf3328_mixer_ac97_write(struct snd_ac97 *ac97,snd_azf3328_mixer_ac97_map_unsupported (reg_ac97,"write" ); } -static int __devinit -snd_azf3328_mixer_new (struct snd_azf3328 *chip) +static int snd_azf3328_mixer_new (struct snd_azf3328 *chip) {struct snd_ac97_bus *bus;struct snd_ac97_template ac97;
@@ -1245,8 +1244,7 @@ static u16 __devinitdata snd_azf3328_init_values[][2] = { { IDX_MIXER_REC_VOLUME, MIXER_MUTE_MASK|0x0707 }, }; -static int __devinit -snd_azf3328_mixer_new (struct snd_azf3328 *chip) +static int snd_azf3328_mixer_new (struct snd_azf3328 *chip) {struct snd_card *card;const struct snd_kcontrol_new *sw;
@@ -1899,8 +1897,7 @@ snd_azf3328_gameport_cooked_read(struct gameport *gameport,return 0 ; } -static int __devinit -snd_azf3328_gameport (struct snd_azf3328 *chip,int dev) +static int snd_azf3328_gameport (struct snd_azf3328 *chip,int dev) {struct gameport *gp;
@@ -2212,8 +2209,7 @@ static struct snd_pcm_ops snd_azf3328_i2s_out_ops = { .pointer = snd_azf3328_pcm_pointer }; -static int __devinit -snd_azf3328_pcm (struct snd_azf3328 *chip) +static int snd_azf3328_pcm (struct snd_azf3328 *chip) {enum {AZF_PCMDEV_STD ,AZF_PCMDEV_I2S_OUT ,NUM_AZF_PCMDEVS };/* pcm devices */
@@ -2344,8 +2340,7 @@ static struct snd_timer_hardware snd_azf3328_timer_hw = { .precise_resolution = snd_azf3328_timer_precise_resolution, }; -static int __devinit -snd_azf3328_timer (struct snd_azf3328 *chip,int device) +static int snd_azf3328_timer (struct snd_azf3328 *chip,int device) {struct snd_timer *timer =NULL ;struct snd_timer_id tid;
@@ -2489,8 +2484,7 @@ snd_azf3328_debug_show_ports(const struct snd_azf3328 *chip)#endif /* DEBUG_MISC */ } -static int __devinit -snd_azf3328_create (struct snd_card *card, +static int snd_azf3328_create (struct snd_card *card,struct pci_dev *pci,unsigned long device_type,struct snd_azf3328 **rchip)
@@ -2615,8 +2609,7 @@ out:return err; } -static int __devinit -snd_azf3328_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) +static int snd_azf3328_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {static int dev;struct snd_card *card;
sound/pci/bt87x.c +4 -4
@@ -696,7 +696,7 @@ static int snd_bt87x_dev_free(struct snd_device *device)return snd_bt87x_free (chip); } -static int __devinit snd_bt87x_pcm (struct snd_bt87x *chip,int device,char *name) +static int snd_bt87x_pcm (struct snd_bt87x *chip,int device,char *name) {int err;struct snd_pcm *pcm;
@@ -714,7 +714,7 @@ static int __devinit snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *nam ALIGN(255 * 4092, 1024)); } -static int __devinit snd_bt87x_create (struct snd_card *card, +static int snd_bt87x_create (struct snd_card *card,struct pci_dev *pci,struct snd_bt87x **rchip) {
@@ -837,7 +837,7 @@ static struct { };/* return the id of the card, or a negative value if it's blacklisted */ -static int __devinit snd_bt87x_detect_card (struct pci_dev *pci) +static int snd_bt87x_detect_card (struct pci_dev *pci) {int i;const struct pci_device_id *supported;
@@ -862,7 +862,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)return SND_BT87X_BOARD_UNKNOWN ; } -static int __devinit snd_bt87x_probe (struct pci_dev *pci, +static int snd_bt87x_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) {static int dev;
sound/pci/ca0106/ca0106_main.c +4 -4
@@ -1352,7 +1352,7 @@ static const struct snd_pcm_chmap_elem side_map[] = { { } }; -static int __devinit snd_ca0106_pcm (struct snd_ca0106 *emu,int device) +static int snd_ca0106_pcm (struct snd_ca0106 *emu,int device) {
Lines of this file are not shown. View the raw message.
sound/pci/cs5535audio/cs5535audio_olpc.c +2 -2
Lines of this file are not shown. View the raw message.
sound/pci/cs5535audio/cs5535audio_pcm.c +1 -1
Lines of this file are not shown. View the raw message.
sound/soc/samsung/s3c24xx_simtec_hermes.c +1 -1
Lines of this file are not shown. View the raw message.
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c +1 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.8.0
Part of the diff is not shown here. View the raw message.
PATCH 262/493 fs/file: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Alexander Viro <[email protected]>
--- fs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/file.c +1 -1
@@ -490,7 +490,7 @@ void exit_files(struct task_struct *tsk) } } -static void __devinit fdtable_defer_list_init (int cpu) +static void fdtable_defer_list_init (int cpu) {struct fdtable_defer *fddef = &per_cpu (fdtable_defer_list, cpu);spin_lock_init (&fddef->lock);
Signature · 1 line
1.8.0
PATCH 264/493 rfkill: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Johannes Berg <[email protected]>
Cc "John W. Linville" <[email protected]>
Cc "David S. Miller" <[email protected]>
--- net/rfkill/rfkill-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rfkill/rfkill-regulator.c +1 -1
@@ -55,7 +55,7 @@ struct rfkill_ops rfkill_regulator_ops = { .set_block = rfkill_regulator_set_block, }; -static int __devinit rfkill_regulator_probe (struct platform_device *pdev) +static int rfkill_regulator_probe (struct platform_device *pdev) {struct rfkill_regulator_platform_data *pdata = pdev->dev.platform_data;struct rfkill_regulator_data *rfkill_data;
Signature · 1 line
1.8.0
PATCH 265/493 mm/vmscan.c: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/vmscan.c +1 -1
@@ -3117,7 +3117,7 @@ unsigned long shrink_all_memory(unsigned long nr_to_reclaim)not required for correctness. So if the last cpu in a node goes away, we get changed to run anywhere: as the first one comes back, restore their cpu bindings. */ -static int __devinit cpu_callback (struct notifier_block *nfb, +static int cpu_callback (struct notifier_block *nfb,unsigned long action,void *hcpu) {int nid;
Signature · 7 lines
1.8.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 269/493 alpha: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
--- arch/alpha/include/asm/parport.h | 4 ++-- arch/alpha/kernel/pci.c | 12 +++++------- arch/alpha/kernel/smp.c | 6 ++---- arch/alpha/kernel/sys_titan.c | 3 +-- 4 files changed, 10 insertions(+), 15 deletions(-)
arch/alpha/include/asm/parport.h +2 -2
@@ -9,8 +9,8 @@#ifndef _ASM_AXP_PARPORT_H#define _ASM_AXP_PARPORT_H 1 -static int __devinit parport_pc_find_isa_ports (int autoirq,int autodma); -static int __devinit parport_pc_find_nonpci_ports (int autoirq,int autodma) +static int parport_pc_find_isa_ports (int autoirq,int autodma); +static int parport_pc_find_nonpci_ports (int autoirq,int autodma) {return parport_pc_find_isa_ports (autoirq, autodma); }
arch/alpha/kernel/pci.c +5 -7
@@ -59,13 +59,13 @@ struct pci_controller *pci_isa_hose;* Quirks. */ -static void __devinit quirk_isa_bridge (struct pci_dev *dev) +static void quirk_isa_bridge (struct pci_dev *dev) { dev->class =PCI_CLASS_BRIDGE_ISA <<8 ; }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82378 , quirk_isa_bridge); -static void __devinit quirk_cypress (struct pci_dev *dev) +static void quirk_cypress (struct pci_dev *dev) {/* The Notorious Cy82C693 chip. */
@@ -104,7 +104,7 @@ static void __devinit quirk_cypress(struct pci_dev *dev)DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_CONTAQ ,PCI_DEVICE_ID_CONTAQ_82C693 , quirk_cypress);/* Called for each device after PCI setup is done. */ -static void __devinit pcibios_fixup_final (struct pci_dev *dev) +static void pcibios_fixup_final (struct pci_dev *dev) {unsigned int class = dev->class >>8 ;
@@ -198,8 +198,7 @@ subsys_initcall(pcibios_init);#ifdef ALPHA_RESTORE_SRM_SETUP static struct pdev_srm_saved_conf *srm_saved_configs; -void __devinit -pdev_save_srm_config (struct pci_dev *dev) +void pdev_save_srm_config (struct pci_dev *dev) {struct pdev_srm_saved_conf *tmp;static int printed =0 ;
@@ -241,8 +240,7 @@ pci_restore_srm_config(void) }#endif -void __devinit -pcibios_fixup_bus (struct pci_bus *bus) +void pcibios_fixup_bus (struct pci_bus *bus) {struct pci_dev *dev = bus->self;
arch/alpha/kernel/smp.c +2 -4
@@ -172,8 +172,7 @@ smp_callin(void) }/* Wait until hwrpb->txrdy is clear for cpu. Return -1 on timeout. */ -static int __devinit -wait_for_txrdy (unsigned long cpumask) +static int wait_for_txrdy (unsigned long cpumask) {unsigned long timeout;
@@ -468,8 +467,7 @@ smp_prepare_cpus(unsigned int max_cpus) smp_num_cpus = smp_num_probed; } -void __devinit -smp_prepare_boot_cpu (void ) +void smp_prepare_boot_cpu (void ) { }
arch/alpha/kernel/sys_titan.c +1 -2
@@ -303,8 +303,7 @@ titan_late_init(void) } -static int __devinit -titan_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +static int titan_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {u8 intline;int irq;
Signature · 1 line
1.8.0
PATCH 270/493 arm: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
Cc Russell King <[email protected]>
Cc Will Deacon <[email protected]>
Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Eric Miao <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc David Brown <[email protected]>
Cc Daniel Walker <[email protected]>
Cc Bryan Huntsman <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Barry Song <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc linux-arm-msm at vger.kernel.org
Cc linux-omap at vger.kernel.org
Cc linux-samsung-soc at vger.kernel.org
Cc patches at opensource.wolfsonmicro.com
Cc linux-tegra at vger.kernel.org
--- arch/arm/common/sa1111.c | 5 ++--- arch/arm/common/scoop.c | 2 +- arch/arm/kernel/bios32.c | 16 ++++++++-------- arch/arm/kernel/etm.c | 4 ++-- arch/arm/kernel/perf_event_cpu.c | 6 +++--- arch/arm/kernel/perf_event_v6.c | 4 ++-- arch/arm/kernel/perf_event_v7.c | 12 ++++++------ arch/arm/kernel/perf_event_xscale.c | 4 ++-- arch/arm/mach-dove/pcie.c | 2 +- arch/arm/mach-imx/cpufreq.c | 2 +- arch/arm/mach-imx/mmdc.c | 2 +- arch/arm/mach-iop13xx/pci.c | 2 +- arch/arm/mach-kirkwood/pcie.c | 2 +- arch/arm/mach-ks8695/board-acs5k.c | 2 +- arch/arm/mach-mmp/sram.c | 2 +- arch/arm/mach-msm/proc_comm.c | 2 +- arch/arm/mach-msm/smd.c | 2 +- arch/arm/mach-mv78xx0/pcie.c | 2 +- arch/arm/mach-omap1/mailbox.c | 2 +- arch/arm/mach-omap2/gpmc.c | 4 ++-- arch/arm/mach-omap2/mailbox.c | 2 +- arch/arm/mach-orion5x/pci.c | 2 +- arch/arm/mach-prima2/pm.c | 2 +- arch/arm/mach-prima2/rtciobrg.c | 2 +- arch/arm/mach-pxa/corgi_pm.c | 2 +- arch/arm/mach-pxa/sharpsl_pm.c | 4 ++-- arch/arm/mach-pxa/spitz_pm.c | 2 +- arch/arm/mach-s3c24xx/h1940-bluetooth.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +- arch/arm/mach-sa1100/jornada720_ssp.c | 2 +- arch/arm/mach-sa1100/neponset.c | 2 +- arch/arm/mach-tegra/pcie.c | 6 +++--- arch/arm/mach-tegra/tegra2_emc.c | 4 ++-- arch/arm/mach-u300/dummyspichip.c | 2 +- arch/arm/plat-omap/dma.c | 2 +- arch/arm/plat-omap/dmtimer.c | 2 +- arch/arm/plat-pxa/ssp.c | 2 +- 38 files changed, 61 insertions(+), 62 deletions(-)
arch/arm/common/sa1111.c +2 -3
@@ -686,8 +686,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,* %-EINVAL no platform data passed * %0 successful. */ -static int __devinit -__sa1111_probe (struct device *me,struct resource *mem,int irq) +static int __sa1111_probe (struct device *me,struct resource *mem,int irq) {struct sa1111_platform_data *pd = me->platform_data;struct sa1111 *sachip;
@@ -1011,7 +1010,7 @@ static int sa1111_resume(struct platform_device *dev)#define sa1111_resume NULL#endif -static int __devinit sa1111_probe (struct platform_device *pdev) +static int sa1111_probe (struct platform_device *pdev) {struct resource *mem;int irq;
arch/arm/common/scoop.c +1 -1
@@ -176,7 +176,7 @@ static int scoop_resume(struct platform_device *dev)#define scoop_resume NULL#endif -static int __devinit scoop_probe (struct platform_device *pdev) +static int scoop_probe (struct platform_device *pdev) {struct scoop_dev *devptr;struct scoop_config *inf;
arch/arm/kernel/bios32.c +8 -8
@@ -78,7 +78,7 @@ void pcibios_report_status(u_int status_mask, int warn)* Bug 3 is responsible for the sound DMA grinding to a halt. We now * live with bug 2. */ -static void __devinit pci_fixup_83c553 (struct pci_dev *dev) +static void pci_fixup_83c553 (struct pci_dev *dev) {/* * Set memory region to start at address 0, and enable IO
@@ -130,7 +130,7 @@ static void __devinit pci_fixup_83c553(struct pci_dev *dev) }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_WINBOND ,PCI_DEVICE_ID_WINBOND_83C553 , pci_fixup_83c553); -static void __devinit pci_fixup_unassign (struct pci_dev *dev) +static void pci_fixup_unassign (struct pci_dev *dev) { dev->resource[0 ].end -= dev->resource[0 ].start; dev->resource[0 ].start =0 ;
@@ -142,7 +142,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940F,* if it is the host bridge by marking it as such. These resources are of * no consequence to the PCI layer (they are handled elsewhere). */ -static void __devinit pci_fixup_dec21285 (struct pci_dev *dev) +static void pci_fixup_dec21285 (struct pci_dev *dev) {int i;
@@ -161,7 +161,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, pci_fixup_d/* * PCI IDE controllers use non-standard I/O port decoding, respect it. */ -static void __devinit pci_fixup_ide_bases (struct pci_dev *dev) +static void pci_fixup_ide_bases (struct pci_dev *dev) {struct resource *r;int i;
@@ -182,7 +182,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);/* * Put the DEC21142 to sleep */ -static void __devinit pci_fixup_dec21142 (struct pci_dev *dev) +static void pci_fixup_dec21142 (struct pci_dev *dev) {pci_write_config_dword (dev,0x40 ,0x80000000 ); }
@@ -204,7 +204,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142, pci_fixup_d* functional. However, The CY82C693U _does not work_ in bus * master mode without locking the PCI bus solid. */ -static void __devinit pci_fixup_cy82c693 (struct pci_dev *dev) +static void pci_fixup_cy82c693 (struct pci_dev *dev) {if ((dev->class >>8 ) ==PCI_CLASS_STORAGE_IDE ) {u32 base0, base1;
@@ -254,7 +254,7 @@ static void __devinit pci_fixup_cy82c693(struct pci_dev *dev) }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_CONTAQ ,PCI_DEVICE_ID_CONTAQ_82C693 , pci_fixup_cy82c693); -static void __devinit pci_fixup_it8152 (struct pci_dev *dev) +static void pci_fixup_it8152 (struct pci_dev *dev) {int i;/* fixup for ITE 8152 devices */
@@ -380,7 +380,7 @@ EXPORT_SYMBOL(pcibios_fixup_bus);* PCI standard swizzle is implemented on plug-in cards and Cardbus based * PCI extenders, so it can not be ignored. */ -static u8 __devinit pcibios_swizzle (struct pci_dev *dev,u8 *pin) +static u8 pcibios_swizzle (struct pci_dev *dev,u8 *pin) {struct pci_sys_data *sys = dev->sysdata;int slot, oldpin = *pin;
arch/arm/kernel/etm.c +2 -2
@@ -339,7 +339,7 @@ static struct miscdevice etb_miscdev = { .fops = &etb_fops, }; -static int __devinit etb_probe (struct amba_device *dev,const struct amba_id *id) +static int etb_probe (struct amba_device *dev,const struct amba_id *id) {struct tracectx *t = &tracer;int ret =0 ;
@@ -531,7 +531,7 @@ static ssize_t trace_mode_store(struct kobject *kobj,static struct kobj_attribute trace_mode_attr =__ATTR (trace_mode,0644 , trace_mode_show, trace_mode_store); -static int __devinit etm_probe (struct amba_device *dev,const struct amba_id *id) +static int etm_probe (struct amba_device *dev,const struct amba_id *id) {struct tracectx *t = &tracer;int ret =0 ;
arch/arm/kernel/perf_event_cpu.c +3 -3
@@ -132,7 +132,7 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler)return 0 ; } -static void __devinit cpu_pmu_init (struct arm_pmu *cpu_pmu) +static void cpu_pmu_init (struct arm_pmu *cpu_pmu) {int cpu;for_each_possible_cpu (cpu) {
@@ -198,7 +198,7 @@ static struct platform_device_id __devinitdata cpu_pmu_plat_device_ids[] = {/* * CPU PMU identification and probing. */ -static int __devinit probe_current_pmu (struct arm_pmu *pmu) +static int probe_current_pmu (struct arm_pmu *pmu) {int cpu =get_cpu ();unsigned long cpuid =read_cpuid_id ();
@@ -252,7 +252,7 @@ static int __devinit probe_current_pmu(struct arm_pmu *pmu)return ret; } -static int __devinit cpu_pmu_device_probe (struct platform_device *pdev) +static int cpu_pmu_device_probe (struct platform_device *pdev) {const struct of_device_id *of_id;int (*init_fn)(struct arm_pmu *);
arch/arm/kernel/perf_event_v6.c +2 -2
@@ -653,7 +653,7 @@ static int armv6_map_event(struct perf_event *event) &armv6_perf_cache_map, 0xFF); } -static int __devinit armv6pmu_init (struct arm_pmu *cpu_pmu) +static int armv6pmu_init (struct arm_pmu *cpu_pmu) { cpu_pmu->name ="v6" ; cpu_pmu->handle_irq = armv6pmu_handle_irq;
@@ -685,7 +685,7 @@ static int armv6mpcore_map_event(struct perf_event *event) &armv6mpcore_perf_cache_map, 0xFF); } -static int __devinit armv6mpcore_pmu_init (struct arm_pmu *cpu_pmu) +static int armv6mpcore_pmu_init (struct arm_pmu *cpu_pmu) { cpu_pmu->name ="v6mpcore" ; cpu_pmu->handle_irq = armv6pmu_handle_irq;
arch/arm/kernel/perf_event_v7.c +6 -6
@@ -1226,7 +1226,7 @@ static void armv7pmu_init(struct arm_pmu *cpu_pmu) cpu_pmu->max_period = (1LLU <<32 ) -1 ; }; -static u32 __devinit armv7_read_num_pmnc_events (void ) +static u32 armv7_read_num_pmnc_events (void ) {u32 nb_cnt;
@@ -1237,7 +1237,7 @@ static u32 __devinit armv7_read_num_pmnc_events(void)return nb_cnt +1 ; } -static int __devinit armv7_a8_pmu_init (struct arm_pmu *cpu_pmu) +static int armv7_a8_pmu_init (struct arm_pmu *cpu_pmu) {armv7pmu_init (cpu_pmu); cpu_pmu->name ="ARMv7 Cortex-A8" ;
@@ -1246,7 +1246,7 @@ static int __devinit armv7_a8_pmu_init(struct arm_pmu *cpu_pmu)return 0 ; } -static int __devinit armv7_a9_pmu_init (struct arm_pmu *cpu_pmu) +static int armv7_a9_pmu_init (struct arm_pmu *cpu_pmu) {armv7pmu_init (cpu_pmu); cpu_pmu->name ="ARMv7 Cortex-A9" ;
@@ -1255,7 +1255,7 @@ static int __devinit armv7_a9_pmu_init(struct arm_pmu *cpu_pmu)return 0 ; } -static int __devinit armv7_a5_pmu_init (struct arm_pmu *cpu_pmu) +static int armv7_a5_pmu_init (struct arm_pmu *cpu_pmu) {armv7pmu_init (cpu_pmu); cpu_pmu->name ="ARMv7 Cortex-A5" ;
@@ -1264,7 +1264,7 @@ static int __devinit armv7_a5_pmu_init(struct arm_pmu *cpu_pmu)return 0 ; } -static int __devinit armv7_a15_pmu_init (struct arm_pmu *cpu_pmu) +static int armv7_a15_pmu_init (struct arm_pmu *cpu_pmu) {armv7pmu_init (cpu_pmu); cpu_pmu->name ="ARMv7 Cortex-A15" ;
@@ -1274,7 +1274,7 @@ static int __devinit armv7_a15_pmu_init(struct arm_pmu *cpu_pmu)return 0 ; } -static int __devinit armv7_a7_pmu_init (struct arm_pmu *cpu_pmu) +static int armv7_a7_pmu_init (struct arm_pmu *cpu_pmu) {armv7pmu_init (cpu_pmu); cpu_pmu->name ="ARMv7 Cortex-A7" ;
arch/arm/kernel/perf_event_xscale.c +2 -2
@@ -440,7 +440,7 @@ static int xscale_map_event(struct perf_event *event) &xscale_perf_cache_map, 0xFF); } -static int __devinit xscale1pmu_init (struct arm_pmu *cpu_pmu) +static int xscale1pmu_init (struct arm_pmu *cpu_pmu) { cpu_pmu->name ="xscale1" ; cpu_pmu->handle_irq = xscale1pmu_handle_irq;
@@ -810,7 +810,7 @@ static inline void xscale2pmu_write_counter(struct perf_event *event, u32 val) } } -static int __devinit xscale2pmu_init (struct arm_pmu *cpu_pmu) +static int xscale2pmu_init (struct arm_pmu *cpu_pmu) { cpu_pmu->name ="xscale2" ; cpu_pmu->handle_irq = xscale2pmu_handle_irq;
arch/arm/mach-dove/pcie.c +1 -1
@@ -135,7 +135,7 @@ static struct pci_ops pcie_ops = { .write = pcie_wr_conf, }; -static void __devinit rc_pci_fixup (struct pci_dev *dev) +static void rc_pci_fixup (struct pci_dev *dev) {/* * Prevent enumeration of root complex.
arch/arm/mach-imx/cpufreq.c +1 -1
@@ -188,7 +188,7 @@ static struct cpufreq_driver mxc_driver = { .name = "imx", }; -static int __devinit mxc_cpufreq_driver_init (void ) +static int mxc_cpufreq_driver_init (void ) {return cpufreq_register_driver (&mxc_driver); }
arch/arm/mach-imx/mmdc.c +1 -1
@@ -21,7 +21,7 @@#define BP_MMDC_MAPSR_PSD 0#define BP_MMDC_MAPSR_PSS 4 -static int __devinit imx_mmdc_probe (struct platform_device *pdev) +static int imx_mmdc_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;void __iomem *mmdc_base, *reg;
arch/arm/mach-iop13xx/pci.c +1 -1
@@ -504,7 +504,7 @@ iop13xx_pci_abort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)/* Scan an IOP13XX PCI bus. nr selects which ATU we use. */ -struct pci_bus *__devinit iop13xx_scan_bus (int nr,struct pci_sys_data *sys) +struct pci_bus *iop13xx_scan_bus (int nr,struct pci_sys_data *sys) {int which_atu;struct pci_bus *bus =NULL ;
arch/arm/mach-kirkwood/pcie.c +1 -1
@@ -207,7 +207,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)return 1 ; } -static void __devinit rc_pci_fixup (struct pci_dev *dev) +static void rc_pci_fixup (struct pci_dev *dev) {/* * Prevent enumeration of root complex.
arch/arm/mach-ks8695/board-acs5k.c +1 -1
@@ -92,7 +92,7 @@ static struct i2c_board_info acs5k_i2c_devs[] __initdata = { }, }; -static void __devinit acs5k_i2c_init (void ) +static void acs5k_i2c_init (void ) {/* The gpio interface */ platform_device_register (&acs5k_i2c_device);
arch/arm/mach-mmp/sram.c +1 -1
@@ -61,7 +61,7 @@ struct gen_pool *sram_get_gpool(char *pool_name) }EXPORT_SYMBOL (sram_get_gpool); -static int __devinit sram_probe (struct platform_device *pdev) +static int sram_probe (struct platform_device *pdev) {struct sram_platdata *pdata = pdev->dev.platform_data;struct sram_bank_info *info;
arch/arm/mach-msm/proc_comm.c +1 -1
@@ -120,7 +120,7 @@ int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2)* and unknown state. This function should be called early to * wait on the ARM9. */ -void __devinit proc_comm_boot_wait (void ) +void proc_comm_boot_wait (void ) {void __iomem *base =MSM_SHARED_RAM_BASE ;
arch/arm/mach-msm/smd.c +1 -1
@@ -988,7 +988,7 @@ int smd_core_init(void)return 0 ; } -static int __devinit msm_smd_probe (struct platform_device *pdev) +static int msm_smd_probe (struct platform_device *pdev) {/* * If we haven't waited for the ARM9 to boot up till now,
arch/arm/mach-mv78xx0/pcie.c +1 -1
@@ -173,7 +173,7 @@ static struct pci_ops pcie_ops = { .write = pcie_wr_conf, }; -static void __devinit rc_pci_fixup (struct pci_dev *dev) +static void rc_pci_fixup (struct pci_dev *dev) {/* * Prevent enumeration of root complex.
arch/arm/mach-omap1/mailbox.c +1 -1
@@ -142,7 +142,7 @@ static struct omap_mbox mbox_dsp_info = {static struct omap_mbox *omap1_mboxes[] = { &mbox_dsp_info,NULL }; -static int __devinit omap1_mbox_probe (struct platform_device *pdev) +static int omap1_mbox_probe (struct platform_device *pdev) {struct resource *mem;int ret;
arch/arm/mach-omap2/gpmc.c +2 -2
@@ -714,7 +714,7 @@ static void __devexit gpmc_mem_exit(void) } -static int __devinit gpmc_mem_init (void ) +static int gpmc_mem_init (void ) {int cs, rc;unsigned long boot_rom_space =0 ;
@@ -748,7 +748,7 @@ static int __devinit gpmc_mem_init(void)return 0 ; } -static __devinit int gpmc_probe (struct platform_device *pdev) +static int gpmc_probe (struct platform_device *pdev) {int rc;u32 l;
arch/arm/mach-omap2/mailbox.c +1 -1
@@ -342,7 +342,7 @@ struct omap_mbox mbox_2_info = {struct omap_mbox *omap4_mboxes[] = { &mbox_1_info, &mbox_2_info,NULL };#endif -static int __devinit omap2_mbox_probe (struct platform_device *pdev) +static int omap2_mbox_probe (struct platform_device *pdev) {struct resource *mem;int ret;
arch/arm/mach-orion5x/pci.c +1 -1
@@ -506,7 +506,7 @@ static int __init pci_setup(struct pci_sys_data *sys)/***************************************************************************** * General PCIe + PCI ****************************************************************************/ -static void __devinit rc_pci_fixup (struct pci_dev *dev) +static void rc_pci_fixup (struct pci_dev *dev) {/* * Prevent enumeration of root complex.
arch/arm/mach-prima2/pm.c +1 -1
@@ -123,7 +123,7 @@ static const struct of_device_id memc_ids[] = { {} }; -static int __devinit sirfsoc_memc_probe (struct platform_device *op) +static int sirfsoc_memc_probe (struct platform_device *op) {struct device_node *np = op->dev.of_node;
arch/arm/mach-prima2/rtciobrg.c +1 -1
@@ -107,7 +107,7 @@ static const struct of_device_id rtciobrg_ids[] = { {} }; -static int __devinit sirfsoc_rtciobrg_probe (struct platform_device *op) +static int sirfsoc_rtciobrg_probe (struct platform_device *op) {struct device_node *np = op->dev.of_node;
arch/arm/mach-pxa/corgi_pm.c +1 -1
@@ -198,7 +198,7 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = {static struct platform_device *corgipm_device; -static int __devinit corgipm_init (void ) +static int corgipm_init (void ) {int ret;
arch/arm/mach-pxa/sharpsl_pm.c +2 -2
@@ -829,7 +829,7 @@ static const struct platform_suspend_ops sharpsl_pm_ops = { };#endif -static int __devinit sharpsl_pm_probe (struct platform_device *pdev) +static int sharpsl_pm_probe (struct platform_device *pdev) {int ret, irq;
@@ -941,7 +941,7 @@ static struct platform_driver sharpsl_pm_driver = { }, }; -static int __devinit sharpsl_pm_init (void ) +static int sharpsl_pm_init (void ) {return platform_driver_register (&sharpsl_pm_driver); }
arch/arm/mach-pxa/spitz_pm.c +1 -1
@@ -232,7 +232,7 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {static struct platform_device *spitzpm_device; -static int __devinit spitzpm_init (void ) +static int spitzpm_init (void ) {int ret;
arch/arm/mach-s3c24xx/h1940-bluetooth.c +1 -1
@@ -62,7 +62,7 @@ static const struct rfkill_ops h1940bt_rfkill_ops = { .set_block = h1940bt_set_block, }; -static int __devinit h1940bt_probe (struct platform_device *pdev) +static int h1940bt_probe (struct platform_device *pdev) {struct rfkill *rfk;int ret =0 ;
arch/arm/mach-s3c24xx/mach-osiris-dvs.c +1 -1
@@ -93,7 +93,7 @@ static struct notifier_block osiris_dvs_nb = { .notifier_call = osiris_dvs_notify, }; -static int __devinit osiris_dvs_probe (struct platform_device *pdev) +static int osiris_dvs_probe (struct platform_device *pdev) {int ret;
arch/arm/mach-s3c64xx/mach-crag6410-module.c +1 -1
@@ -343,7 +343,7 @@ static __devinitdata const struct { .i2c_devs = wm2200_i2c, .num_i2c_devs = ARRAY_SIZE(wm2200_i2c) }, }; -static __devinit int wlf_gf_module_probe (struct i2c_client *i2c, +static int wlf_gf_module_probe (struct i2c_client *i2c,const struct i2c_device_id *i2c_id) {int ret, i, j, id, rev;
arch/arm/mach-sa1100/jornada720_ssp.c +1 -1
@@ -130,7 +130,7 @@ void jornada_ssp_end(void) };EXPORT_SYMBOL (jornada_ssp_end); -static int __devinit jornada_ssp_probe (struct platform_device *dev) +static int jornada_ssp_probe (struct platform_device *dev) {int ret;
arch/arm/mach-sa1100/neponset.c +1 -1
@@ -233,7 +233,7 @@ static struct sa1111_platform_data sa1111_info = { .disable_devs = SA1111_DEVID_PS2_MSE, }; -static int __devinit neponset_probe (struct platform_device *dev) +static int neponset_probe (struct platform_device *dev) {struct neponset_drvdata *d;struct resource *nep_res, *sa1111_res, *smc91x_res;
arch/arm/mach-tegra/pcie.c +3 -3
@@ -331,7 +331,7 @@ static struct pci_ops tegra_pcie_ops = { .write = tegra_pcie_write_conf, }; -static void __devinit tegra_pcie_fixup_bridge (struct pci_dev *dev) +static void tegra_pcie_fixup_bridge (struct pci_dev *dev) {u16 reg;
@@ -345,7 +345,7 @@ static void __devinit tegra_pcie_fixup_bridge(struct pci_dev *dev)DECLARE_PCI_FIXUP_FINAL (PCI_ANY_ID ,PCI_ANY_ID , tegra_pcie_fixup_bridge);/* Tegra PCIE root complex wrongly reports device class */ -static void __devinit tegra_pcie_fixup_class (struct pci_dev *dev) +static void tegra_pcie_fixup_class (struct pci_dev *dev) { dev->class =PCI_CLASS_BRIDGE_PCI <<8 ; }
@@ -353,7 +353,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0bf0, tegra_pcie_fixup_class);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_NVIDIA ,0x0bf1 , tegra_pcie_fixup_class);/* Tegra PCIE requires relaxed ordering */ -static void __devinit tegra_pcie_relax_enable (struct pci_dev *dev) +static void tegra_pcie_relax_enable (struct pci_dev *dev) {pcie_capability_set_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_DEVCTL_RELAX_EN ); }
arch/arm/mach-tegra/tegra2_emc.c +2 -2
@@ -268,7 +268,7 @@ static struct tegra_emc_pdata *tegra_emc_dt_parse_pdata( }#endif -static struct tegra_emc_pdata __devinit *tegra_emc_fill_pdata (struct platform_device *pdev) +static struct tegra_emc_pdata *tegra_emc_fill_pdata (struct platform_device *pdev) {struct clk *c =clk_get_sys (NULL ,"emc" );struct tegra_emc_pdata *pdata;
@@ -296,7 +296,7 @@ static struct tegra_emc_pdata __devinit *tegra_emc_fill_pdata(struct platform_dereturn pdata; } -static int __devinit tegra_emc_probe (struct platform_device *pdev) +static int tegra_emc_probe (struct platform_device *pdev) {struct tegra_emc_pdata *pdata;struct resource *res;
arch/arm/mach-u300/dummyspichip.c +1 -1
@@ -222,7 +222,7 @@ static ssize_t dummy_looptest(struct device *dev, static DEVICE_ATTR(looptest, S_IRUGO, dummy_looptest, NULL); -static int __devinit pl022_dummy_probe (struct spi_device *spi) +static int pl022_dummy_probe (struct spi_device *spi) {struct dummy *p_dummy;int status;
arch/arm/plat-omap/dma.c +1 -1
@@ -2000,7 +2000,7 @@ void omap_dma_global_context_restore(void)omap_clear_dma (ch); } -static int __devinit omap_system_dma_probe (struct platform_device *pdev) +static int omap_system_dma_probe (struct platform_device *pdev) {int ch, ret =0 ;int dma_irq;
arch/arm/plat-omap/dmtimer.c +1 -1
@@ -688,7 +688,7 @@ EXPORT_SYMBOL_GPL(omap_dm_timers_active);* Called by driver framework@the end of device registration for all * timer devices. */ -static int __devinit omap_dm_timer_probe (struct platform_device *pdev) +static int omap_dm_timer_probe (struct platform_device *pdev) {unsigned long flags;struct omap_dm_timer *timer;
arch/arm/plat-pxa/ssp.c +1 -1
@@ -72,7 +72,7 @@ void pxa_ssp_free(struct ssp_device *ssp) }EXPORT_SYMBOL (pxa_ssp_free); -static int __devinit pxa_ssp_probe (struct platform_device *pdev) +static int pxa_ssp_probe (struct platform_device *pdev) {const struct platform_device_id *id =platform_get_device_id (pdev);struct resource *res;
Signature · 1 line
1.8.0
PATCH 270/493 arm: remove use of __devinit
Quoted 2 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.
Acked-by Mark Brown <[email protected]>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121120/3696d712/attachment.sig>
PATCH 270/493 arm: remove use of __devinit
In reply to Bill PembertonQuoted 10 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.Signed-off-by Bill Pemberton <[email protected]>Cc Russell King <[email protected]>Cc Will Deacon <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sascha Hauer <[email protected]>Cc Eric Miao <[email protected]>
Acked-by Eric Miao <[email protected]>
PATCH 270/493 arm: remove use of __devinit
In reply to Bill PembertonQuoted 7 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.Signed-off-by Bill Pemberton <[email protected]>--- arch/arm/mach-msm/proc_comm.c | 2 +- arch/arm/mach-msm/smd.c | 2 +-
Acked-by David Brown <[email protected]>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 270/493 arm: remove use of __devinit
In reply to Bill Pemberton2012/11/20 Bill Pemberton <[email protected]>:
Quoted 25 lines
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.Signed-off-by Bill Pemberton <[email protected]>Cc Russell King <[email protected]>Cc Will Deacon <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sascha Hauer <[email protected]>Cc Eric Miao <[email protected]>Cc Haojian Zhuang <[email protected]>Cc David Brown <[email protected]>Cc Daniel Walker <[email protected]>Cc Bryan Huntsman <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Barry Song <[email protected]>Cc Ben Dooks <[email protected]>Cc Kukjin Kim <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-arm-msm at vger.kernel.orgCc linux-omap at vger.kernel.orgCc linux-samsung-soc at vger.kernel.orgCc patches at opensource.wolfsonmicro.comCc linux-tegra at vger.kernel.org
Quoted 1 line
---
Acked-by Barry Song <[email protected]>
PATCH 270/493 arm: remove use of __devinit
In reply to Bill PembertonQuoted 27 lines · Bill Pemberton
CONFIG_HOTPLUGis going away as an option so__devinitis no longer needed.Signed-off-by Bill Pemberton <[email protected]>Cc Russell King <[email protected]>Cc Will Deacon <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Cc Sascha Hauer <[email protected]>Cc Eric Miao <[email protected]>Cc Haojian Zhuang <[email protected]>Cc David Brown <[email protected]>Cc Daniel Walker <[email protected]>Cc Bryan Huntsman <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Barry Song <[email protected]>Cc Ben Dooks <[email protected]>Cc Kukjin Kim <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc linux-arm-msm at vger.kernel.orgCc linux-omap at vger.kernel.orgCc linux-samsung-soc at vger.kernel.orgCc patches at opensource.wolfsonmicro.comCc linux-tegra at vger.kernel.org---
[...]
Quoted 3 lines
arch/arm/mach-s3c24xx/h1940-bluetooth.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +-
For above s3c24xx and s3c64xx,
Acked-by Kukjin Kim <[email protected]>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 276/493 mips: remove use of __devinit
In reply to a message not in the archiveCONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by Bill Pemberton <[email protected]>
--- arch/mips/cavium-octeon/serial.c | 2 +- arch/mips/include/asm/pci.h | 2 +- arch/mips/kernel/smp.c | 2 +- arch/mips/lantiq/xway/dma.c | 3 +-- arch/mips/lantiq/xway/gptu.c | 2 +- arch/mips/lantiq/xway/xrx200_phy_fw.c | 2 +- arch/mips/mti-sead3/sead3-i2c-drv.c | 2 +- arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 3 +-- arch/mips/pci/fixup-cobalt.c | 8 ++++---- arch/mips/pci/fixup-emma2rh.c | 4 ++-- arch/mips/pci/fixup-fuloong2e.c | 12 ++++++------ arch/mips/pci/fixup-lemote2f.c | 12 ++++++------ arch/mips/pci/fixup-malta.c | 6 +++--- arch/mips/pci/fixup-rc32434.c | 4 ++-- arch/mips/pci/fixup-sb1250.c | 6 +++--- arch/mips/pci/ops-bcm63xx.c | 2 +- arch/mips/pci/ops-tx4927.c | 4 ++-- arch/mips/pci/pci-alchemy.c | 2 +- arch/mips/pci/pci-ip27.c | 4 ++-- arch/mips/pci/pci-lantiq.c | 4 ++-- arch/mips/pci/pci.c | 8 ++++---- arch/mips/sni/setup.c | 2 +- arch/mips/txx9/generic/pci.c | 11 +++++------ 23 files changed, 52 insertions(+), 55 deletions(-)
arch/mips/cavium-octeon/serial.c +1 -1
@@ -43,7 +43,7 @@ void octeon_serial_out(struct uart_port *up, int offset, int value)cvmx_write_csr ((uint64_t )(up->membase + (offset <<3 )), (u8 )value); } -static int __devinit octeon_serial_probe (struct platform_device *pdev) +static int octeon_serial_probe (struct platform_device *pdev) {int irq, res;struct resource *res_mem;
arch/mips/include/asm/pci.h +1 -1
@@ -145,7 +145,7 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)extern char * (*pcibios_plat_setup)(char *str);/* this function parses memory ranges from a device node */ -extern void __devinit pci_load_of_ranges (struct pci_controller *hose, +extern void pci_load_of_ranges (struct pci_controller *hose,struct device_node *node);#endif /* _ASM_PCI_H */
arch/mips/kernel/smp.c +1 -1
@@ -188,7 +188,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) }/* preload SMP state for boot cpu */ -void __devinit smp_prepare_boot_cpu (void ) +void smp_prepare_boot_cpu (void ) {set_cpu_possible (0 , true);set_cpu_online (0 , true);
arch/mips/lantiq/xway/dma.c +1 -2
@@ -210,8 +210,7 @@ ltq_dma_init_port(int p) }EXPORT_SYMBOL_GPL (ltq_dma_init_port); -static int __devinit -ltq_dma_init (struct platform_device *pdev) +static int ltq_dma_init (struct platform_device *pdev) {struct clk *clk;struct resource *res;
arch/mips/lantiq/xway/gptu.c +1 -1
@@ -133,7 +133,7 @@ static inline void clkdev_add_gptu(struct device *dev, const char *con,clkdev_add (&clk->cl); } -static int __devinit gptu_probe (struct platform_device *pdev) +static int gptu_probe (struct platform_device *pdev) {struct clk *clk;struct resource *res;
arch/mips/lantiq/xway/xrx200_phy_fw.c +1 -1
@@ -54,7 +54,7 @@ static dma_addr_t xway_gphy_load(struct platform_device *pdev)return dev_addr; } -static int __devinit xway_phy_fw_probe (struct platform_device *pdev) +static int xway_phy_fw_probe (struct platform_device *pdev) {dma_addr_t fw_addr;struct property *pp;
arch/mips/mti-sead3/sead3-i2c-drv.c +1 -1
@@ -297,7 +297,7 @@ static void sead3_i2c_platform_setup(struct pic32_i2c_platform_data *priv) priv->base + PIC32_I2CxSTATCLR); } -static int __devinit sead3_i2c_platform_probe (struct platform_device *pdev) +static int sead3_i2c_platform_probe (struct platform_device *pdev) {struct pic32_i2c_platform_data *priv;struct resource *r;
arch/mips/mti-sead3/sead3-pic32-i2c-drv.c +1 -2
@@ -304,8 +304,7 @@ static void i2c_platform_disable(struct i2c_platform_data *priv)pr_debug ("i2c_platform_disable\n" ); } -static int __devinit -i2c_platform_probe (struct platform_device *pdev) +static int i2c_platform_probe (struct platform_device *pdev) {struct i2c_platform_data *priv;struct resource *r;
arch/mips/pci/fixup-cobalt.c +4 -4
@@ -37,7 +37,7 @@#define VIA_COBALT_BRD_ID_REG 0x94#define VIA_COBALT_BRD_REG_to_ID (reg) ((unsigned char)(reg) >> 4) -static void __devinit qube_raq_galileo_early_fixup (struct pci_dev *dev) +static void qube_raq_galileo_early_fixup (struct pci_dev *dev) {if (dev->devfn ==PCI_DEVFN (0 ,0 ) && (dev->class >>8 ) ==PCI_CLASS_MEMORY_OTHER ) {
@@ -51,7 +51,7 @@ static void __devinit qube_raq_galileo_early_fixup(struct pci_dev *dev)DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_MARVELL ,PCI_DEVICE_ID_MARVELL_GT64111 , qube_raq_galileo_early_fixup); -static void __devinit qube_raq_via_bmIDE_fixup (struct pci_dev *dev) +static void qube_raq_via_bmIDE_fixup (struct pci_dev *dev) {unsigned short cfgword;unsigned char lt;
@@ -74,7 +74,7 @@ static void __devinit qube_raq_via_bmIDE_fixup(struct pci_dev *dev)DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_1 , qube_raq_via_bmIDE_fixup); -static void __devinit qube_raq_galileo_fixup (struct pci_dev *dev) +static void qube_raq_galileo_fixup (struct pci_dev *dev) {if (dev->devfn !=PCI_DEVFN (0 ,0 ))return ;
@@ -129,7 +129,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT64111,int cobalt_board_id; -static void __devinit qube_raq_via_board_id_fixup (struct pci_dev *dev) +static void qube_raq_via_board_id_fixup (struct pci_dev *dev) {u8 id;int retval;
arch/mips/pci/fixup-emma2rh.c +2 -2
@@ -52,7 +52,7 @@ static unsigned char irq_map[][5] __initdata = { MARKEINS_PCI_IRQ_INTA, MARKEINS_PCI_IRQ_INTB,}, }; -static void __devinit nec_usb_controller_fixup (struct pci_dev *dev) +static void nec_usb_controller_fixup (struct pci_dev *dev) {if (PCI_SLOT (dev->devfn) ==EMMA2RH_USB_SLOT )/* on board USB controller configuration */
@@ -67,7 +67,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,* if it is the host bridge by marking it as such. These resources are of * no consequence to the PCI layer (they are handled elsewhere). */ -static void __devinit emma2rh_pci_host_fixup (struct pci_dev *dev) +static void emma2rh_pci_host_fixup (struct pci_dev *dev) {int i;
arch/mips/pci/fixup-fuloong2e.c +6 -6
@@ -48,7 +48,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)return 0 ; } -static void __devinit loongson2e_nec_fixup (struct pci_dev *pdev) +static void loongson2e_nec_fixup (struct pci_dev *pdev) {unsigned int val;
@@ -60,7 +60,7 @@ static void __devinit loongson2e_nec_fixup(struct pci_dev *pdev)pci_write_config_dword (pdev,0xe4 ,1 <<5 ); } -static void __devinit loongson2e_686b_func0_fixup (struct pci_dev *pdev) +static void loongson2e_686b_func0_fixup (struct pci_dev *pdev) {unsigned char c;
@@ -135,7 +135,7 @@ static void __devinit loongson2e_686b_func0_fixup(struct pci_dev *pdev)printk (KERN_INFO "via686b fix: ISA bridge done\n" ); } -static void __devinit loongson2e_686b_func1_fixup (struct pci_dev *pdev) +static void loongson2e_686b_func1_fixup (struct pci_dev *pdev) {printk (KERN_INFO "via686b fix: IDE\n" );
@@ -168,19 +168,19 @@ static void __devinit loongson2e_686b_func1_fixup(struct pci_dev *pdev)printk (KERN_INFO "via686b fix: IDE done\n" ); } -static void __devinit loongson2e_686b_func2_fixup (struct pci_dev *pdev) +static void loongson2e_686b_func2_fixup (struct pci_dev *pdev) {/* irq routing */ pci_write_config_byte (pdev,PCI_INTERRUPT_LINE ,10 ); } -static void __devinit loongson2e_686b_func3_fixup (struct pci_dev *pdev) +static void loongson2e_686b_func3_fixup (struct pci_dev *pdev) {/* irq routing */ pci_write_config_byte (pdev,PCI_INTERRUPT_LINE ,11 ); } -static void __devinit loongson2e_686b_func5_fixup (struct pci_dev *pdev) +static void loongson2e_686b_func5_fixup (struct pci_dev *pdev) {unsigned int val;unsigned char c;
arch/mips/pci/fixup-lemote2f.c +6 -6
@@ -96,21 +96,21 @@ int pcibios_plat_dev_init(struct pci_dev *dev) }/* CS5536 SPEC. fixup */ -static void __devinit loongson_cs5536_isa_fixup (struct pci_dev *pdev) +static void loongson_cs5536_isa_fixup (struct pci_dev *pdev) {/* the uart1 and uart2 interrupt in PIC is enabled as default */ pci_write_config_dword (pdev,PCI_UART1_INT_REG ,1 );pci_write_config_dword (pdev,PCI_UART2_INT_REG ,1 ); } -static void __devinit loongson_cs5536_ide_fixup (struct pci_dev *pdev) +static void loongson_cs5536_ide_fixup (struct pci_dev *pdev) {/* setting the mutex pin as IDE function */ pci_write_config_dword (pdev,PCI_IDE_CFG_REG ,CS5536_IDE_FLASH_SIGNATURE ); } -static void __devinit loongson_cs5536_acc_fixup (struct pci_dev *pdev) +static void loongson_cs5536_acc_fixup (struct pci_dev *pdev) {/* enable the AUDIO interrupt in PIC */ pci_write_config_dword (pdev,PCI_ACC_INT_REG ,1 );
@@ -118,14 +118,14 @@ static void __devinit loongson_cs5536_acc_fixup(struct pci_dev *pdev)pci_write_config_byte (pdev,PCI_LATENCY_TIMER ,0xc0 ); } -static void __devinit loongson_cs5536_ohci_fixup (struct pci_dev *pdev) +static void loongson_cs5536_ohci_fixup (struct pci_dev *pdev) {/* enable the OHCI interrupt in PIC */ /* THE OHCI, EHCI, UDC, OTG are shared with interrupt in PIC */ pci_write_config_dword (pdev,PCI_OHCI_INT_REG ,1 ); } -static void __devinit loongson_cs5536_ehci_fixup (struct pci_dev *pdev) +static void loongson_cs5536_ehci_fixup (struct pci_dev *pdev) {u32 hi, lo;
@@ -137,7 +137,7 @@ static void __devinit loongson_cs5536_ehci_fixup(struct pci_dev *pdev)pci_write_config_dword (pdev,PCI_EHCI_FLADJ_REG ,0x2000 ); } -static void __devinit loongson_nec_fixup (struct pci_dev *pdev) +static void loongson_nec_fixup (struct pci_dev *pdev) {unsigned int val;
arch/mips/pci/fixup-malta.c +3 -3
@@ -50,7 +50,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)return 0 ; } -static void __devinit malta_piix_func0_fixup (struct pci_dev *pdev) +static void malta_piix_func0_fixup (struct pci_dev *pdev) {unsigned char reg_val;static int piixirqmap[16 ]__devinitdata = {/* PIIX PIRQC[A:D] irq mappings */
@@ -84,7 +84,7 @@ static void __devinit malta_piix_func0_fixup(struct pci_dev *pdev)DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82371AB_0 , malta_piix_func0_fixup); -static void __devinit malta_piix_func1_fixup (struct pci_dev *pdev) +static void malta_piix_func1_fixup (struct pci_dev *pdev) {unsigned char reg_val;
@@ -104,7 +104,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB, malta_piix_func1_fixup);/* Enable PCI 2.1 compatibility in PIIX4 */ -static void __devinit quirk_dlcsetup (struct pci_dev *dev) +static void quirk_dlcsetup (struct pci_dev *dev) {u8 odlc, ndlc;
arch/mips/pci/fixup-rc32434.c +2 -2
@@ -37,7 +37,7 @@ static int __devinitdata irq_map[2][12] = { {0, 0, 1, 3, 0, 2, 1, 3, 0, 2, 1, 3} }; -int __devinit pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {int irq =0 ;
@@ -47,7 +47,7 @@ int __devinit pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)return irq +GROUP4_IRQ_BASE +4 ; } -static void __devinit rc32434_pci_early_fixup (struct pci_dev *dev) +static void rc32434_pci_early_fixup (struct pci_dev *dev) {if (PCI_SLOT (dev->devfn) ==6 && dev->bus->number ==0 ) {/* disable prefetched memory range */
arch/mips/pci/fixup-sb1250.c +3 -3
@@ -15,7 +15,7 @@* Set the BCM1250, etc. PCI host bridge's TRDY timeout * to the finite max. */ -static void __devinit quirk_sb1250_pci (struct pci_dev *dev) +static void quirk_sb1250_pci (struct pci_dev *dev) {pci_write_config_byte (dev,0x40 ,0xff ); }
@@ -25,7 +25,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_PCI,/* * The BCM1250, etc. PCI/HT bridge reports as a host bridge. */ -static void __devinit quirk_sb1250_ht (struct pci_dev *dev) +static void quirk_sb1250_ht (struct pci_dev *dev) { dev->class =PCI_CLASS_BRIDGE_PCI <<8 ; }
@@ -35,7 +35,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_HT,/* * Set the SP1011 HT/PCI bridge's TRDY timeout to the finite max. */ -static void __devinit quirk_sp1011 (struct pci_dev *dev) +static void quirk_sp1011 (struct pci_dev *dev) {pci_write_config_byte (dev,0x64 ,0xff ); }
arch/mips/pci/ops-bcm63xx.c +1 -1
@@ -411,7 +411,7 @@ struct pci_ops bcm63xx_cb_ops = {* only one IO window, so it cannot be shared by PCI and cardbus, use * fixup to choose and detect unhandled configuration */ -static void __devinit bcm63xx_fixup (struct pci_dev *dev) +static void bcm63xx_fixup (struct pci_dev *dev) {static int io_window =-1 ;int i, found, new_io_window;
arch/mips/pci/ops-tx4927.c +2 -2
@@ -197,7 +197,7 @@ static struct { .gbwc = 0xfe0, /* 4064 GBUSCLK for CCFG.GTOT=0b11 */ }; -char *__devinit tx4927_pcibios_setup (char *str) +char *tx4927_pcibios_setup (char *str) {unsigned long val;
@@ -495,7 +495,7 @@ irqreturn_t tx4927_pcierr_interrupt(int irq, void *dev_id) }#ifdef CONFIG_TOSHIBA_FPCIB0 -static void __devinit tx4927_quirk_slc90e66_bridge (struct pci_dev *dev) +static void tx4927_quirk_slc90e66_bridge (struct pci_dev *dev) {struct tx4927_pcic_reg __iomem *pcicptr =pci_bus_to_pcicptr (dev->bus);
arch/mips/pci/pci-alchemy.c +1 -1
@@ -356,7 +356,7 @@ static struct syscore_ops alchemy_pci_pmops = { .resume = alchemy_pci_resume, }; -static int __devinit alchemy_pci_probe (struct platform_device *pdev) +static int alchemy_pci_probe (struct platform_device *pdev) {struct alchemy_pci_platdata *pd = pdev->dev.platform_data;struct alchemy_pci_context *ctx;
arch/mips/pci/pci-ip27.c +2 -2
@@ -143,7 +143,7 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid)* A given PCI device, in general, should be able to intr any of the cpus * on any one of the hubs connected to its xbow. */ -int __devinit pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {return 0 ; }
@@ -212,7 +212,7 @@ static inline void pci_enable_swapping(struct pci_dev *dev) bridge->b_widget.w_tflush;/* Flush */ } -static void __devinit pci_fixup_ioc3 (struct pci_dev *d) +static void pci_fixup_ioc3 (struct pci_dev *d) {pci_disable_swapping (d); }
arch/mips/pci/pci-lantiq.c +2 -2
@@ -95,7 +95,7 @@ static inline u32 ltq_calc_bar11mask(void)return bar11mask; } -static int __devinit ltq_pci_startup (struct platform_device *pdev) +static int ltq_pci_startup (struct platform_device *pdev) {struct device_node *node = pdev->dev.of_node;const __be32 *req_mask, *bus_clk;
@@ -201,7 +201,7 @@ static int __devinit ltq_pci_startup(struct platform_device *pdev)return 0 ; } -static int __devinit ltq_pci_probe (struct platform_device *pdev) +static int ltq_pci_probe (struct platform_device *pdev) {struct resource *res_cfg, *res_bridge;
arch/mips/pci/pci.c +4 -4
@@ -76,7 +76,7 @@ pcibios_align_resource(void *data, const struct resource *res,return start; } -static void __devinit pcibios_scanbus (struct pci_controller *hose) +static void pcibios_scanbus (struct pci_controller *hose) {static int next_busno;static int need_domain_info;
@@ -120,7 +120,7 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose) }#ifdef CONFIG_OF -void __devinit pci_load_of_ranges (struct pci_controller *hose, +void pci_load_of_ranges (struct pci_controller *hose,struct device_node *node) {const __be32 *ranges;
@@ -174,7 +174,7 @@ void __devinit pci_load_of_ranges(struct pci_controller *hose,static DEFINE_MUTEX (pci_scan_mutex); -void __devinit register_pci_controller (struct pci_controller *hose) +void register_pci_controller (struct pci_controller *hose) {if (request_resource (&iomem_resource, hose->mem_resource) <0 ) goto out;
@@ -303,7 +303,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)return pcibios_plat_dev_init (dev); } -void __devinit pcibios_fixup_bus (struct pci_bus *bus) +void pcibios_fixup_bus (struct pci_bus *bus) {struct pci_dev *dev = bus->self;
arch/mips/sni/setup.c +1 -1
@@ -236,7 +236,7 @@ void __init plat_mem_setup(void)#include <video/vga.h> #include <video/cirrus.h> -static void __devinit quirk_cirrus_ram_size (struct pci_dev *dev) +static void quirk_cirrus_ram_size (struct pci_dev *dev) {u16 cmd;
arch/mips/txx9/generic/pci.c +5 -6
@@ -256,8 +256,7 @@ static irqreturn_t i8259_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static int __devinit -txx9_i8259_irq_setup (int irq) +static int txx9_i8259_irq_setup (int irq) {int err;
@@ -269,7 +268,7 @@ txx9_i8259_irq_setup(int irq)return err; } -static void __devinit quirk_slc90e66_bridge (struct pci_dev *dev) +static void quirk_slc90e66_bridge (struct pci_dev *dev) {int irq;/* PCI/ISA Bridge interrupt */ u8 reg_64;
@@ -304,7 +303,7 @@ static void __devinit quirk_slc90e66_bridge(struct pci_dev *dev)smsc_fdc37m81x_config_end (); } -static void __devinit quirk_slc90e66_ide (struct pci_dev *dev) +static void quirk_slc90e66_ide (struct pci_dev *dev) {unsigned char dat;int regs[2 ] = {0x41 ,0x43 };
@@ -339,7 +338,7 @@ static void __devinit quirk_slc90e66_ide(struct pci_dev *dev) }#endif /* CONFIG_TOSHIBA_FPCIB0 */ -static void __devinit tc35815_fixup (struct pci_dev *dev) +static void tc35815_fixup (struct pci_dev *dev) {/* This device may have PM registers but not they are not suported. */ if (dev->pm_cap) {
@@ -348,7 +347,7 @@ static void __devinit tc35815_fixup(struct pci_dev *dev) } } -static void __devinit final_fixup (struct pci_dev *dev) +static void final_fixup (struct pci_dev *dev) {unsigned char bist;
Signature · 1 line
1.8.0