Skip to content

L
linux
Commit 612b95cd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Drivers: mfd: remove __dev* attributes. 

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

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

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

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f568f6ca
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 35 deletions
drivers/mfd/max8997.c
View file @ 612b95cd
...@@ -50,7 +50,7 @@ static struct mfd_cell max8997_devs[] = { ...@@ -50,7 +50,7 @@ static struct mfd_cell max8997_devs[] = {
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id __devinitdata max8997_pmic_dt_match[] = { static struct of_device_id max8997_pmic_dt_match[] = {
{ .compatible = "maxim,max8997-pmic", .data = TYPE_MAX8997 }, { .compatible = "maxim,max8997-pmic", .data = TYPE_MAX8997 },
{}, {},
}; };
......
drivers/mfd/retu-mfd.c
View file @ 612b95cd
...@@ -171,8 +171,7 @@ static struct regmap_config retu_config = { ...@@ -171,8 +171,7 @@ static struct regmap_config retu_config = {
.val_bits = 16, .val_bits = 16,
}; };
static int __devinit retu_probe(struct i2c_client *i2c, static int retu_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
const struct i2c_device_id *id)
{ {
struct retu_dev *rdev; struct retu_dev *rdev;
int ret; int ret;
...@@ -225,7 +224,7 @@ static int __devinit retu_probe(struct i2c_client *i2c, ...@@ -225,7 +224,7 @@ static int __devinit retu_probe(struct i2c_client *i2c,
return 0; return 0;
} }
static int __devexit retu_remove(struct i2c_client *i2c) static int retu_remove(struct i2c_client *i2c)
{ {
struct retu_dev *rdev = i2c_get_clientdata(i2c); struct retu_dev *rdev = i2c_get_clientdata(i2c);
......
drivers/mfd/rtsx_pcr.c
View file @ 612b95cd
...@@ -998,8 +998,8 @@ static int rtsx_pci_init_chip(struct rtsx_pcr *pcr) ...@@ -998,8 +998,8 @@ static int rtsx_pci_init_chip(struct rtsx_pcr *pcr)
return 0; 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) const struct pci_device_id *id)
{ {
struct rtsx_pcr *pcr; struct rtsx_pcr *pcr;
struct pcr_handle *handle; struct pcr_handle *handle;
...@@ -1123,7 +1123,7 @@ static int __devinit rtsx_pci_probe(struct pci_dev *pcidev, ...@@ -1123,7 +1123,7 @@ static int __devinit rtsx_pci_probe(struct pci_dev *pcidev,
return ret; return ret;
} }
static void __devexit rtsx_pci_remove(struct pci_dev *pcidev) static void rtsx_pci_remove(struct pci_dev *pcidev)
{ {
struct pcr_handle *handle = pci_get_drvdata(pcidev); struct pcr_handle *handle = pci_get_drvdata(pcidev);
struct rtsx_pcr *pcr = handle->pcr; struct rtsx_pcr *pcr = handle->pcr;
...@@ -1241,7 +1241,7 @@ static struct pci_driver rtsx_pci_driver = { ...@@ -1241,7 +1241,7 @@ static struct pci_driver rtsx_pci_driver = {
.name = DRV_NAME_RTSX_PCI, .name = DRV_NAME_RTSX_PCI,
.id_table = rtsx_pci_ids, .id_table = rtsx_pci_ids,
.probe = rtsx_pci_probe, .probe = rtsx_pci_probe,
.remove = __devexit_p(rtsx_pci_remove), .remove = rtsx_pci_remove,
.suspend = rtsx_pci_suspend, .suspend = rtsx_pci_suspend,
.resume = rtsx_pci_resume, .resume = rtsx_pci_resume,
}; };
......
drivers/mfd/sta2x11-mfd.c
View file @ 612b95cd
...@@ -510,19 +510,19 @@ enum mfd1_bar1_cells { ...@@ -510,19 +510,19 @@ enum mfd1_bar1_cells {
STA2X11_APB_SOC_REGS = 0, STA2X11_APB_SOC_REGS = 0,
}; };
static const __devinitconst struct resource vic_resources[] = { static const struct resource vic_resources[] = {
CELL_4K(STA2X11_MFD_VIC_NAME, STA2X11_VIC), CELL_4K(STA2X11_MFD_VIC_NAME, STA2X11_VIC),
}; };
static const __devinitconst struct resource apb_soc_regs_resources[] = { static const struct resource apb_soc_regs_resources[] = {
CELL_4K(STA2X11_MFD_APB_SOC_REGS_NAME, STA2X11_APB_SOC_REGS), CELL_4K(STA2X11_MFD_APB_SOC_REGS_NAME, STA2X11_APB_SOC_REGS),
}; };
static __devinitdata struct mfd_cell sta2x11_mfd1_bar0[] = { static struct mfd_cell sta2x11_mfd1_bar0[] = {
DEV(STA2X11_MFD_VIC_NAME, vic_resources), DEV(STA2X11_MFD_VIC_NAME, vic_resources),
}; };
static __devinitdata struct mfd_cell sta2x11_mfd1_bar1[] = { static struct mfd_cell sta2x11_mfd1_bar1[] = {
DEV(STA2X11_MFD_APB_SOC_REGS_NAME, apb_soc_regs_resources), DEV(STA2X11_MFD_APB_SOC_REGS_NAME, apb_soc_regs_resources),
}; };
......
drivers/mfd/stmpe.c
View file @ 612b95cd
...@@ -892,8 +892,7 @@ static struct irq_domain_ops stmpe_irq_ops = { ...@@ -892,8 +892,7 @@ static struct irq_domain_ops stmpe_irq_ops = {
.xlate = irq_domain_xlate_twocell, .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)
struct device_node *np)
{ {
int base = 0; int base = 0;
int num_irqs = stmpe->variant->num_irqs; int num_irqs = stmpe->variant->num_irqs;
...@@ -911,7 +910,7 @@ static int __devinit stmpe_irq_init(struct stmpe *stmpe, ...@@ -911,7 +910,7 @@ static int __devinit stmpe_irq_init(struct stmpe *stmpe,
return 0; 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; unsigned int irq_trigger = stmpe->pdata->irq_trigger;
int autosleep_timeout = stmpe->pdata->autosleep_timeout; int autosleep_timeout = stmpe->pdata->autosleep_timeout;
...@@ -970,14 +969,13 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe) ...@@ -970,14 +969,13 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe)
return stmpe_reg_write(stmpe, stmpe->regs[STMPE_IDX_ICR_LSB], icr); 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)
struct mfd_cell *cell)
{ {
return mfd_add_devices(stmpe->dev, stmpe->pdata->id, cell, 1, return mfd_add_devices(stmpe->dev, stmpe->pdata->id, cell, 1,
NULL, stmpe->irq_base, stmpe->domain); 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; struct stmpe_variant_info *variant = stmpe->variant;
unsigned int platform_blocks = stmpe->pdata->blocks; unsigned int platform_blocks = stmpe->pdata->blocks;
...@@ -1013,8 +1011,7 @@ static int __devinit stmpe_devices_init(struct stmpe *stmpe) ...@@ -1013,8 +1011,7 @@ static int __devinit stmpe_devices_init(struct stmpe *stmpe)
return ret; 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 *np)
{ {
struct device_node *child; struct device_node *child;
...@@ -1044,7 +1041,7 @@ void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata, ...@@ -1044,7 +1041,7 @@ void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata,
} }
/* Called from client specific probe routines */ /* 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 stmpe_platform_data *pdata = dev_get_platdata(ci->dev);
struct device_node *np = ci->dev->of_node; struct device_node *np = ci->dev->of_node;
......
drivers/mfd/ti_am335x_tscadc.c
View file @ 612b95cd
...@@ -58,7 +58,7 @@ static void tscadc_idle_config(struct ti_tscadc_dev *config) ...@@ -58,7 +58,7 @@ static void tscadc_idle_config(struct ti_tscadc_dev *config)
tscadc_writel(config, REG_IDLECONFIG, idleconfig); 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 ti_tscadc_dev *tscadc;
struct resource *res; struct resource *res;
...@@ -202,7 +202,7 @@ static int __devinit ti_tscadc_probe(struct platform_device *pdev) ...@@ -202,7 +202,7 @@ static int __devinit ti_tscadc_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit ti_tscadc_remove(struct platform_device *pdev) static int ti_tscadc_remove(struct platform_device *pdev)
{ {
struct ti_tscadc_dev *tscadc = platform_get_drvdata(pdev); struct ti_tscadc_dev *tscadc = platform_get_drvdata(pdev);
...@@ -263,7 +263,7 @@ static struct platform_driver ti_tscadc_driver = { ...@@ -263,7 +263,7 @@ static struct platform_driver ti_tscadc_driver = {
.pm = TSCADC_PM_OPS, .pm = TSCADC_PM_OPS,
}, },
.probe = ti_tscadc_probe, .probe = ti_tscadc_probe,
.remove = __devexit_p(ti_tscadc_remove), .remove = ti_tscadc_remove,
}; };
......
drivers/mfd/tps80031.c
View file @ 612b95cd
...@@ -269,8 +269,7 @@ static int tps80031_init_ext_control(struct tps80031 *tps80031, ...@@ -269,8 +269,7 @@ static int tps80031_init_ext_control(struct tps80031 *tps80031,
return ret; return ret;
} }
static int __devinit tps80031_irq_init(struct tps80031 *tps80031, int irq, static int tps80031_irq_init(struct tps80031 *tps80031, int irq, int irq_base)
int irq_base)
{ {
struct device *dev = tps80031->dev; struct device *dev = tps80031->dev;
int i, ret; int i, ret;
...@@ -416,8 +415,8 @@ static const struct regmap_config tps80031_regmap_configs[] = { ...@@ -416,8 +415,8 @@ static const struct regmap_config tps80031_regmap_configs[] = {
}, },
}; };
static int __devinit tps80031_probe(struct i2c_client *client, static int tps80031_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct tps80031_platform_data *pdata = client->dev.platform_data; struct tps80031_platform_data *pdata = client->dev.platform_data;
struct tps80031 *tps80031; struct tps80031 *tps80031;
...@@ -519,7 +518,7 @@ static int __devinit tps80031_probe(struct i2c_client *client, ...@@ -519,7 +518,7 @@ static int __devinit tps80031_probe(struct i2c_client *client,
return ret; return ret;
} }
static int __devexit tps80031_remove(struct i2c_client *client) static int tps80031_remove(struct i2c_client *client)
{ {
struct tps80031 *tps80031 = i2c_get_clientdata(client); struct tps80031 *tps80031 = i2c_get_clientdata(client);
int i; int i;
...@@ -553,7 +552,7 @@ static struct i2c_driver tps80031_driver = { ...@@ -553,7 +552,7 @@ static struct i2c_driver tps80031_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = tps80031_probe, .probe = tps80031_probe,
.remove = __devexit_p(tps80031_remove), .remove = tps80031_remove,
.id_table = tps80031_id_table, .id_table = tps80031_id_table,
}; };
......
drivers/mfd/twl6040.c
View file @ 612b95cd
...@@ -517,8 +517,8 @@ static struct regmap_irq_chip twl6040_irq_chip = { ...@@ -517,8 +517,8 @@ static struct regmap_irq_chip twl6040_irq_chip = {
.mask_base = TWL6040_REG_INTMR, .mask_base = TWL6040_REG_INTMR,
}; };
static int __devinit twl6040_probe(struct i2c_client *client, static int twl6040_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct twl6040_platform_data *pdata = client->dev.platform_data; struct twl6040_platform_data *pdata = client->dev.platform_data;
struct device_node *node = client->dev.of_node; struct device_node *node = client->dev.of_node;
...@@ -699,7 +699,7 @@ static int __devinit twl6040_probe(struct i2c_client *client, ...@@ -699,7 +699,7 @@ static int __devinit twl6040_probe(struct i2c_client *client,
return ret; return ret;
} }
static int __devexit twl6040_remove(struct i2c_client *client) static int twl6040_remove(struct i2c_client *client)
{ {
struct twl6040 *twl6040 = i2c_get_clientdata(client); struct twl6040 *twl6040 = i2c_get_clientdata(client);
...@@ -735,7 +735,7 @@ static struct i2c_driver twl6040_driver = { ...@@ -735,7 +735,7 @@ static struct i2c_driver twl6040_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = twl6040_probe, .probe = twl6040_probe,
.remove = __devexit_p(twl6040_remove), .remove = twl6040_remove,
.id_table = twl6040_i2c_id, .id_table = twl6040_i2c_id,
}; };
......
drivers/mfd/vexpress-sysreg.c
View file @ 612b95cd
...@@ -414,7 +414,7 @@ static ssize_t vexpress_sysreg_sys_id_show(struct device *dev, ...@@ -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); 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; int err;
struct resource *res = platform_get_resource(pdev, struct resource *res = platform_get_resource(pdev,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7