Commit 9671f099 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

tty: remove use of __devinit 



CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Lucas Tavares <lucaskt@linux.vnet.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Tony Prisk <linux@prisktech.co.nz>
Acked-by: default avatarTobias Klauser <tklauser@distanz.ch>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d47b716

drivers/tty/cyclades.c

+8 −8
Original line number Diff line number Diff line
@@ -3099,7 +3099,7 @@ static const struct tty_port_operations cyz_port_ops = { 
 * ---------------------------------------------------------------------

 */



static int __devinit cy_init_card(struct cyclades_card *cinfo)

static int cy_init_card(struct cyclades_card *cinfo)

{

	struct cyclades_port *info;

	unsigned int channel, port;
@@ -3196,7 +3196,7 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo) 


/* initialize chips on Cyclom-Y card -- return number of valid

   chips (which is number of ports/4) */

static unsigned short __devinit cyy_init_card(void __iomem *true_base_addr,

static unsigned short cyy_init_card(void __iomem *true_base_addr,

		int index)

{

	unsigned int chip_number;
@@ -3405,7 +3405,7 @@ static int __init cy_detect_isa(void) 
}				/* cy_detect_isa */



#ifdef CONFIG_PCI

static inline int __devinit cyc_isfwstr(const char *str, unsigned int size)

static inline int cyc_isfwstr(const char *str, unsigned int size)

{

	unsigned int a;
@@ -3420,7 +3420,7 @@ static inline int __devinit cyc_isfwstr(const char *str, unsigned int size) 
	return 0;

}



static inline void __devinit cyz_fpga_copy(void __iomem *fpga, const u8 *data,

static inline void cyz_fpga_copy(void __iomem *fpga, const u8 *data,

		unsigned int size)

{

	for (; size > 0; size--) {
@@ -3429,7 +3429,7 @@ static inline void __devinit cyz_fpga_copy(void __iomem *fpga, const u8 *data, 
	}

}



static void __devinit plx_init(struct pci_dev *pdev, int irq,

static void plx_init(struct pci_dev *pdev, int irq,

		struct RUNTIME_9060 __iomem *addr)

{

	/* Reset PLX */
@@ -3449,7 +3449,7 @@ static void __devinit plx_init(struct pci_dev *pdev, int irq, 
	pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, irq);

}



static int __devinit __cyz_load_fw(const struct firmware *fw,

static int __cyz_load_fw(const struct firmware *fw,

		const char *name, const u32 mailbox, void __iomem *base,

		void __iomem *fpga)

{
@@ -3526,7 +3526,7 @@ static int __devinit __cyz_load_fw(const struct firmware *fw, 
	return 0;

}



static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,

static int cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,

		struct RUNTIME_9060 __iomem *ctl_addr, int irq)

{

	const struct firmware *fw;
@@ -3692,7 +3692,7 @@ err: 
	return retval;

}



static int __devinit cy_pci_probe(struct pci_dev *pdev,

static int cy_pci_probe(struct pci_dev *pdev,

		const struct pci_device_id *ent)

{

	struct cyclades_card *card;

drivers/tty/ehv_bytechan.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static const struct tty_port_operations ehv_bc_tty_port_ops = { 
	.shutdown = ehv_bc_tty_port_shutdown,

};



static int __devinit ehv_bc_tty_probe(struct platform_device *pdev)

static int ehv_bc_tty_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct ehv_bc_data *bc;

drivers/tty/hvc/hvc_opal.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static const struct hv_ops hvc_opal_hvsi_ops = { 
	.tiocmset = hvc_opal_hvsi_tiocmset,

};



static int __devinit hvc_opal_probe(struct platform_device *dev)

static int hvc_opal_probe(struct platform_device *dev)

{

	const struct hv_ops *ops;

	struct hvc_struct *hp;

drivers/tty/hvc/hvc_vio.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int udbg_hvc_getc(void) 
	}

}



static int __devinit hvc_vio_probe(struct vio_dev *vdev,

static int hvc_vio_probe(struct vio_dev *vdev,

				   const struct vio_device_id *id)

{

	const struct hv_ops *ops;

drivers/tty/hvc/hvc_xen.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static int xencons_connect_backend(struct xenbus_device *dev, 
	return ret;

}



static int __devinit xencons_probe(struct xenbus_device *dev,

static int xencons_probe(struct xenbus_device *dev,

				  const struct xenbus_device_id *id)

{

	int ret, devid;

CRA Git | Maintained and supported by SUSTech CRA and CCSE