Skip to content

Commit 28eb0e4

Browse files
committed
MIPS: drivers: 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, 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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent cad5cef commit 28eb0e4

File tree

23 files changed

+61
-65
lines changed

23 files changed

+61
-65
lines changed

arch/mips/cavium-octeon/serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void octeon_serial_out(struct uart_port *up, int offset, int value)
4343
cvmx_write_csr((uint64_t)(up->membase + (offset << 3)), (u8)value);
4444
}
4545

46-
static int __devinit octeon_serial_probe(struct platform_device *pdev)
46+
static int octeon_serial_probe(struct platform_device *pdev)
4747
{
4848
int irq, res;
4949
struct resource *res_mem;

arch/mips/include/asm/pci.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
145145
extern char * (*pcibios_plat_setup)(char *str);
146146

147147
/* this function parses memory ranges from a device node */
148-
extern void __devinit pci_load_of_ranges(struct pci_controller *hose,
149-
struct device_node *node);
148+
extern void pci_load_of_ranges(struct pci_controller *hose,
149+
struct device_node *node);
150150

151151
#endif /* _ASM_PCI_H */

arch/mips/kernel/smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
188188
}
189189

190190
/* preload SMP state for boot cpu */
191-
void __devinit smp_prepare_boot_cpu(void)
191+
void smp_prepare_boot_cpu(void)
192192
{
193193
set_cpu_possible(0, true);
194194
set_cpu_online(0, true);

arch/mips/lantiq/xway/dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ ltq_dma_init_port(int p)
210210
}
211211
EXPORT_SYMBOL_GPL(ltq_dma_init_port);
212212

213-
static int __devinit
213+
static int
214214
ltq_dma_init(struct platform_device *pdev)
215215
{
216216
struct clk *clk;

arch/mips/lantiq/xway/gptu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static inline void clkdev_add_gptu(struct device *dev, const char *con,
133133
clkdev_add(&clk->cl);
134134
}
135135

136-
static int __devinit gptu_probe(struct platform_device *pdev)
136+
static int gptu_probe(struct platform_device *pdev)
137137
{
138138
struct clk *clk;
139139
struct resource *res;

arch/mips/lantiq/xway/xrx200_phy_fw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static dma_addr_t xway_gphy_load(struct platform_device *pdev)
5454
return dev_addr;
5555
}
5656

57-
static int __devinit xway_phy_fw_probe(struct platform_device *pdev)
57+
static int xway_phy_fw_probe(struct platform_device *pdev)
5858
{
5959
dma_addr_t fw_addr;
6060
struct property *pp;

arch/mips/mti-sead3/sead3-i2c-drv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ static void sead3_i2c_platform_setup(struct pic32_i2c_platform_data *priv)
297297
priv->base + PIC32_I2CxSTATCLR);
298298
}
299299

300-
static int __devinit sead3_i2c_platform_probe(struct platform_device *pdev)
300+
static int sead3_i2c_platform_probe(struct platform_device *pdev)
301301
{
302302
struct pic32_i2c_platform_data *priv;
303303
struct resource *r;
@@ -345,7 +345,7 @@ static int __devinit sead3_i2c_platform_probe(struct platform_device *pdev)
345345
return ret;
346346
}
347347

348-
static int __devexit sead3_i2c_platform_remove(struct platform_device *pdev)
348+
static int sead3_i2c_platform_remove(struct platform_device *pdev)
349349
{
350350
struct pic32_i2c_platform_data *priv = platform_get_drvdata(pdev);
351351

@@ -383,7 +383,7 @@ static struct platform_driver sead3_i2c_platform_driver = {
383383
.owner = THIS_MODULE,
384384
},
385385
.probe = sead3_i2c_platform_probe,
386-
.remove = __devexit_p(sead3_i2c_platform_remove),
386+
.remove = sead3_i2c_platform_remove,
387387
.suspend = sead3_i2c_platform_suspend,
388388
.resume = sead3_i2c_platform_resume,
389389
};

arch/mips/mti-sead3/sead3-pic32-i2c-drv.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,7 @@ static void i2c_platform_disable(struct i2c_platform_data *priv)
304304
pr_debug("i2c_platform_disable\n");
305305
}
306306

307-
static int __devinit
308-
i2c_platform_probe(struct platform_device *pdev)
307+
static int i2c_platform_probe(struct platform_device *pdev)
309308
{
310309
struct i2c_platform_data *priv;
311310
struct resource *r;
@@ -362,8 +361,7 @@ i2c_platform_probe(struct platform_device *pdev)
362361
return ret;
363362
}
364363

365-
static int __devexit
366-
i2c_platform_remove(struct platform_device *pdev)
364+
static int i2c_platform_remove(struct platform_device *pdev)
367365
{
368366
struct i2c_platform_data *priv = platform_get_drvdata(pdev);
369367

@@ -408,7 +406,7 @@ static struct platform_driver i2c_platform_driver = {
408406
.owner = THIS_MODULE,
409407
},
410408
.probe = i2c_platform_probe,
411-
.remove = __devexit_p(i2c_platform_remove),
409+
.remove = i2c_platform_remove,
412410
.suspend = i2c_platform_suspend,
413411
.resume = i2c_platform_resume,
414412
};

arch/mips/pci/fixup-cobalt.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#define VIA_COBALT_BRD_ID_REG 0x94
3838
#define VIA_COBALT_BRD_REG_to_ID(reg) ((unsigned char)(reg) >> 4)
3939

40-
static void __devinit qube_raq_galileo_early_fixup(struct pci_dev *dev)
40+
static void qube_raq_galileo_early_fixup(struct pci_dev *dev)
4141
{
4242
if (dev->devfn == PCI_DEVFN(0, 0) &&
4343
(dev->class >> 8) == PCI_CLASS_MEMORY_OTHER) {
@@ -51,7 +51,7 @@ static void __devinit qube_raq_galileo_early_fixup(struct pci_dev *dev)
5151
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT64111,
5252
qube_raq_galileo_early_fixup);
5353

54-
static void __devinit qube_raq_via_bmIDE_fixup(struct pci_dev *dev)
54+
static void qube_raq_via_bmIDE_fixup(struct pci_dev *dev)
5555
{
5656
unsigned short cfgword;
5757
unsigned char lt;
@@ -74,7 +74,7 @@ static void __devinit qube_raq_via_bmIDE_fixup(struct pci_dev *dev)
7474
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1,
7575
qube_raq_via_bmIDE_fixup);
7676

77-
static void __devinit qube_raq_galileo_fixup(struct pci_dev *dev)
77+
static void qube_raq_galileo_fixup(struct pci_dev *dev)
7878
{
7979
if (dev->devfn != PCI_DEVFN(0, 0))
8080
return;
@@ -129,7 +129,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT64111,
129129

130130
int cobalt_board_id;
131131

132-
static void __devinit qube_raq_via_board_id_fixup(struct pci_dev *dev)
132+
static void qube_raq_via_board_id_fixup(struct pci_dev *dev)
133133
{
134134
u8 id;
135135
int retval;

arch/mips/pci/fixup-emma2rh.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static unsigned char irq_map[][5] __initdata = {
5252
MARKEINS_PCI_IRQ_INTA, MARKEINS_PCI_IRQ_INTB,},
5353
};
5454

55-
static void __devinit nec_usb_controller_fixup(struct pci_dev *dev)
55+
static void nec_usb_controller_fixup(struct pci_dev *dev)
5656
{
5757
if (PCI_SLOT(dev->devfn) == EMMA2RH_USB_SLOT)
5858
/* on board USB controller configuration */
@@ -67,7 +67,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,
6767
* if it is the host bridge by marking it as such. These resources are of
6868
* no consequence to the PCI layer (they are handled elsewhere).
6969
*/
70-
static void __devinit emma2rh_pci_host_fixup(struct pci_dev *dev)
70+
static void emma2rh_pci_host_fixup(struct pci_dev *dev)
7171
{
7272
int i;
7373

0 commit comments

Comments
 (0)