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

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

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

drivers/mfd/max8997.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static struct mfd_cell max8997_devs[] = { 
};



#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 },

	{},

};

drivers/mfd/retu-mfd.c

+2 −3
Original line number Diff line number Diff line
@@ -171,8 +171,7 @@ static struct regmap_config retu_config = { 
	.val_bits = 16,

};



static int __devinit retu_probe(struct i2c_client *i2c,

				const struct i2c_device_id *id)

static int retu_probe(struct i2c_client *i2c, const struct i2c_device_id *id)

{

	struct retu_dev *rdev;

	int ret;
@@ -225,7 +224,7 @@ static int __devinit retu_probe(struct i2c_client *i2c, 
	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);

drivers/mfd/rtsx_pcr.c

+4 −4
Original line number Diff line number Diff line
@@ -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;
@@ -1123,7 +1123,7 @@ static int __devinit rtsx_pci_probe(struct pci_dev *pcidev, 
	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 rtsx_pcr *pcr = handle->pcr;
@@ -1241,7 +1241,7 @@ static struct pci_driver rtsx_pci_driver = { 
	.name = DRV_NAME_RTSX_PCI,

	.id_table = rtsx_pci_ids,

	.probe = rtsx_pci_probe,

	.remove = __devexit_p(rtsx_pci_remove),

	.remove = rtsx_pci_remove,

	.suspend = rtsx_pci_suspend,

	.resume = rtsx_pci_resume,

};

drivers/mfd/sta2x11-mfd.c

+4 −4
Original line number Diff line number Diff line
@@ -510,19 +510,19 @@ enum mfd1_bar1_cells { 
	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),

};



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

};



static __devinitdata struct mfd_cell sta2x11_mfd1_bar0[] = {

static struct mfd_cell sta2x11_mfd1_bar0[] = {

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

};

drivers/mfd/stmpe.c

+6 −9
Original line number Diff line number Diff line
@@ -892,8 +892,7 @@ static struct irq_domain_ops stmpe_irq_ops = { 
        .xlate  = irq_domain_xlate_twocell,

};



static int __devinit stmpe_irq_init(struct stmpe *stmpe,

				struct device_node *np)

static int stmpe_irq_init(struct stmpe *stmpe, struct device_node *np)

{

	int base = 0;

	int num_irqs = stmpe->variant->num_irqs;
@@ -911,7 +910,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;
@@ -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);

}



static int __devinit stmpe_add_device(struct stmpe *stmpe,

				      struct mfd_cell *cell)

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;
@@ -1013,8 +1011,7 @@ static int __devinit stmpe_devices_init(struct stmpe *stmpe) 
	return ret;

}



void __devinit stmpe_of_probe(struct stmpe_platform_data *pdata,

			struct device_node *np)

void stmpe_of_probe(struct stmpe_platform_data *pdata, struct device_node *np)

{

	struct device_node *child;
@@ -1044,7 +1041,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;