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

Commit 6c44512d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: atm: 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: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 082a2004

drivers/atm/ambassador.c

+30 −23
Original line number Diff line number Diff line
@@ -1507,9 +1507,9 @@ static void do_housekeeping (unsigned long arg) { 


/********** creation of communication queues **********/



static int __devinit create_queues (amb_dev * dev, unsigned int cmds,

				 unsigned int txs, unsigned int * rxs,

				 unsigned int * rx_buffer_sizes) {

static int create_queues(amb_dev *dev, unsigned int cmds, unsigned int txs,

			 unsigned int *rxs, unsigned int *rx_buffer_sizes)

{

  unsigned char pool;

  size_t total = 0;

  void * memory;
@@ -1737,8 +1737,9 @@ static int decode_loader_result (loader_command cmd, u32 result) 
	return res;

}



static int __devinit do_loader_command (volatile loader_block * lb,

				     const amb_dev * dev, loader_command cmd) {

static int do_loader_command(volatile loader_block *lb, const amb_dev *dev,

			     loader_command cmd)

{

  

  unsigned long timeout;
@@ -1793,8 +1794,9 @@ static int __devinit do_loader_command (volatile loader_block * lb, 


/* loader: determine loader version */



static int __devinit get_loader_version (loader_block * lb,

				      const amb_dev * dev, u32 * version) {

static int get_loader_version(loader_block *lb, const amb_dev *dev,

			      u32 *version)

{

  int res;

  

  PRINTD (DBG_FLOW|DBG_LOAD, "get_loader_version");
@@ -1809,9 +1811,9 @@ static int __devinit get_loader_version (loader_block * lb, 


/* loader: write memory data blocks */



static int __devinit loader_write (loader_block* lb,

				   const amb_dev *dev,

				   const struct ihex_binrec *rec) {

static int loader_write(loader_block *lb, const amb_dev *dev,

			const struct ihex_binrec *rec)

{

  transfer_block * tb = &lb->payload.transfer;

  

  PRINTD (DBG_FLOW|DBG_LOAD, "loader_write");
@@ -1824,9 +1826,9 @@ static int __devinit loader_write (loader_block* lb, 


/* loader: verify memory data blocks */



static int __devinit loader_verify (loader_block * lb,

				    const amb_dev *dev,

				    const struct ihex_binrec *rec) {

static int loader_verify(loader_block *lb, const amb_dev *dev,

			 const struct ihex_binrec *rec)

{

  transfer_block * tb = &lb->payload.transfer;

  int res;
@@ -1842,8 +1844,8 @@ static int __devinit loader_verify (loader_block * lb, 


/* loader: start microcode */



static int __devinit loader_start (loader_block * lb,

				const amb_dev * dev, u32 address) {

static int loader_start(loader_block *lb, const amb_dev *dev, u32 address)

{

  PRINTD (DBG_FLOW|DBG_LOAD, "loader_start");

  

  lb->payload.start = cpu_to_be32 (address);
@@ -1918,7 +1920,8 @@ static int amb_reset (amb_dev * dev, int diags) { 


/********** transfer and start the microcode **********/



static int __devinit ucode_init (loader_block * lb, amb_dev * dev) {

static int ucode_init(loader_block *lb, amb_dev *dev)

{

  const struct firmware *fw;

  unsigned long start_address;

  const struct ihex_binrec *rec;
@@ -1980,7 +1983,8 @@ static inline __be32 bus_addr(void * addr) { 
    return cpu_to_be32 (virt_to_bus (addr));

}



static int __devinit amb_talk (amb_dev * dev) {

static int amb_talk(amb_dev *dev)

{

  adap_talk_block a;

  unsigned char pool;

  unsigned long timeout;
@@ -2027,7 +2031,8 @@ static int __devinit amb_talk (amb_dev * dev) { 
}



// get microcode version

static void __devinit amb_ucode_version (amb_dev * dev) {

static void amb_ucode_version(amb_dev *dev)

{

  u32 major;

  u32 minor;

  command cmd;
@@ -2042,7 +2047,8 @@ static void __devinit amb_ucode_version (amb_dev * dev) { 
}

  

// get end station address

static void __devinit amb_esi (amb_dev * dev, u8 * esi) {

static void amb_esi(amb_dev *dev, u8 *esi)

{

  u32 lower4;

  u16 upper2;

  command cmd;
@@ -2088,7 +2094,7 @@ static void fixup_plx_window (amb_dev *dev, loader_block *lb) 
	return;

}



static int __devinit amb_init (amb_dev * dev)

static int amb_init(amb_dev *dev)

{

  loader_block lb;
@@ -2184,7 +2190,8 @@ static void setup_pci_dev(struct pci_dev *pci_dev) 
	}

}



static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)

static int amb_probe(struct pci_dev *pci_dev,

		     const struct pci_device_id *pci_ent)

{

	amb_dev * dev;

	int err;
@@ -2285,7 +2292,7 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_ 
}





static void __devexit amb_remove_one(struct pci_dev *pci_dev)

static void amb_remove_one(struct pci_dev *pci_dev)

{

	struct amb_dev *dev;
@@ -2379,7 +2386,7 @@ MODULE_DEVICE_TABLE(pci, amb_pci_tbl); 
static struct pci_driver amb_driver = {

	.name =		"amb",

	.probe =	amb_probe,

	.remove =	__devexit_p(amb_remove_one),

	.remove =	amb_remove_one,

	.id_table =	amb_pci_tbl,

};

drivers/atm/eni.c

+9 −9
Original line number Diff line number Diff line
@@ -1567,7 +1567,7 @@ tx_complete++; 
/*--------------------------------- entries ---------------------------------*/





static char * const media_name[] __devinitconst = {

static char * const media_name[] = {

    "MMF", "SMF", "MMF", "03?", /*  0- 3 */

    "UTP", "05?", "06?", "07?", /*  4- 7 */

    "TAXI","09?", "10?", "11?", /*  8-11 */
@@ -1591,7 +1591,7 @@ static char * const media_name[] __devinitconst = { 
  } })





static int __devinit get_esi_asic(struct atm_dev *dev)

static int get_esi_asic(struct atm_dev *dev)

{

	struct eni_dev *eni_dev;

	unsigned char tonga;
@@ -1683,7 +1683,7 @@ static int __devinit get_esi_asic(struct atm_dev *dev) 
#undef GET_SEPROM





static int __devinit get_esi_fpga(struct atm_dev *dev, void __iomem *base)

static int get_esi_fpga(struct atm_dev *dev, void __iomem *base)

{

	void __iomem *mac_base;

	int i;
@@ -1694,7 +1694,7 @@ static int __devinit get_esi_fpga(struct atm_dev *dev, void __iomem *base) 
}





static int __devinit eni_do_init(struct atm_dev *dev)

static int eni_do_init(struct atm_dev *dev)

{

	struct midway_eprom __iomem *eprom;

	struct eni_dev *eni_dev;
@@ -1797,7 +1797,7 @@ static void eni_do_release(struct atm_dev *dev) 
	iounmap(ed->ioaddr);

}



static int __devinit eni_start(struct atm_dev *dev)

static int eni_start(struct atm_dev *dev)

{

	struct eni_dev *eni_dev;
@@ -2226,7 +2226,7 @@ static const struct atmdev_ops ops = { 
};





static int __devinit eni_init_one(struct pci_dev *pci_dev,

static int eni_init_one(struct pci_dev *pci_dev,

			const struct pci_device_id *ent)

{

	struct atm_dev *dev;
@@ -2292,7 +2292,7 @@ static struct pci_device_id eni_pci_tbl[] = { 
MODULE_DEVICE_TABLE(pci,eni_pci_tbl);





static void __devexit eni_remove_one(struct pci_dev *pdev)

static void eni_remove_one(struct pci_dev *pdev)

{

	struct atm_dev *dev = pci_get_drvdata(pdev);

	struct eni_dev *ed = ENI_DEV(dev);
@@ -2310,7 +2310,7 @@ static struct pci_driver eni_driver = { 
	.name		= DEV_LABEL,

	.id_table	= eni_pci_tbl,

	.probe		= eni_init_one,

	.remove		= __devexit_p(eni_remove_one),

	.remove		= eni_remove_one,

};

drivers/atm/firestream.c

+16 −16
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ struct reginit_item { 
};





static struct reginit_item PHY_NTC_INIT[] __devinitdata = {

static struct reginit_item PHY_NTC_INIT[] = {

	{ PHY_CLEARALL, 0x40 }, 

	{ 0x12,  0x0001 },

	{ 0x13,  0x7605 },
@@ -1295,7 +1295,7 @@ static const struct atmdev_ops ops = { 
};





static void __devinit undocumented_pci_fix (struct pci_dev *pdev)

static void undocumented_pci_fix(struct pci_dev *pdev)

{

	u32 tint;
@@ -1319,13 +1319,13 @@ static void __devinit undocumented_pci_fix (struct pci_dev *pdev) 
 *                              PHY routines                              *

 **************************************************************************/



static void __devinit write_phy (struct fs_dev *dev, int regnum, int val)

static void write_phy(struct fs_dev *dev, int regnum, int val)

{

	submit_command (dev,  &dev->hp_txq, QE_CMD_PRP_WR | QE_CMD_IMM_INQ,

			regnum, val, 0);

}



static int __devinit init_phy (struct fs_dev *dev, struct reginit_item *reginit)

static int init_phy(struct fs_dev *dev, struct reginit_item *reginit)

{

	int i;
@@ -1381,7 +1381,7 @@ static void reset_chip (struct fs_dev *dev) 
	}

}



static void __devinit *aligned_kmalloc (int size, gfp_t flags, int alignment)

static void *aligned_kmalloc(int size, gfp_t flags, int alignment)

{

	void  *t;
@@ -1398,8 +1398,8 @@ static void __devinit *aligned_kmalloc (int size, gfp_t flags, int alignment) 
	return NULL;

}



static int __devinit init_q (struct fs_dev *dev, 

			  struct queue *txq, int queue, int nentries, int is_rq)

static int init_q(struct fs_dev *dev, struct queue *txq, int queue,

		  int nentries, int is_rq)

{

	int sz = nentries * sizeof (struct FS_QENTRY);

	struct FS_QENTRY *p;
@@ -1434,8 +1434,8 @@ static int __devinit init_q (struct fs_dev *dev, 
}





static int __devinit init_fp (struct fs_dev *dev, 

			   struct freepool *fp, int queue, int bufsize, int nr_buffers)

static int init_fp(struct fs_dev *dev, struct freepool *fp, int queue,

		   int bufsize, int nr_buffers)

{

	func_enter ();
@@ -1528,7 +1528,7 @@ static void top_off_fp (struct fs_dev *dev, struct freepool *fp, 
	fs_dprintk (FS_DEBUG_QUEUE, "Added %d entries. \n", n);

}



static void __devexit free_queue (struct fs_dev *dev, struct queue *txq)

static void free_queue(struct fs_dev *dev, struct queue *txq)

{

	func_enter ();
@@ -1544,7 +1544,7 @@ static void __devexit free_queue (struct fs_dev *dev, struct queue *txq) 
	func_exit ();

}



static void __devexit free_freepool (struct fs_dev *dev, struct freepool *fp)

static void free_freepool(struct fs_dev *dev, struct freepool *fp)

{

	func_enter ();
@@ -1662,7 +1662,7 @@ static void fs_poll (unsigned long data) 
}

#endif



static int __devinit fs_init (struct fs_dev *dev)

static int fs_init(struct fs_dev *dev)

{

	struct pci_dev  *pci_dev;

	int isr, to;
@@ -1897,7 +1897,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
	return 1;

}



static int __devinit firestream_init_one (struct pci_dev *pci_dev,

static int firestream_init_one(struct pci_dev *pci_dev,

			       const struct pci_device_id *ent)

{

	struct atm_dev *atm_dev;
@@ -1934,7 +1934,7 @@ static int __devinit firestream_init_one (struct pci_dev *pci_dev, 
	return -ENODEV;

}



static void __devexit firestream_remove_one (struct pci_dev *pdev)

static void firestream_remove_one(struct pci_dev *pdev)

{

	int i;

	struct fs_dev *dev, *nxtdev;
@@ -2038,7 +2038,7 @@ static struct pci_driver firestream_driver = { 
	.name		= "firestream",

	.id_table	= firestream_pci_tbl,

	.probe		= firestream_init_one,

	.remove		= __devexit_p(firestream_remove_one),

	.remove		= firestream_remove_one,

};



static int __init firestream_init_module (void)

drivers/atm/fore200e.c

+27 −43
Original line number Diff line number Diff line
@@ -527,8 +527,7 @@ fore200e_pca_reset(struct fore200e* fore200e) 
}





static int __devinit

fore200e_pca_map(struct fore200e* fore200e)

static int fore200e_pca_map(struct fore200e* fore200e)

{

    DPRINTK(2, "device %s being mapped in memory\n", fore200e->name);
@@ -561,8 +560,7 @@ fore200e_pca_unmap(struct fore200e* fore200e) 
}





static int __devinit

fore200e_pca_configure(struct fore200e* fore200e)

static int fore200e_pca_configure(struct fore200e *fore200e)

{

    struct pci_dev* pci_dev = (struct pci_dev*)fore200e->bus_dev;

    u8              master_ctrl, latency;
@@ -2028,8 +2026,7 @@ fore200e_change_qos(struct atm_vcc* vcc,struct atm_qos* qos, int flags) 
}

    



static int __devinit

fore200e_irq_request(struct fore200e* fore200e)

static int fore200e_irq_request(struct fore200e *fore200e)

{

    if (request_irq(fore200e->irq, fore200e_interrupt, IRQF_SHARED, fore200e->name, fore200e->atm_dev) < 0) {
@@ -2051,8 +2048,7 @@ fore200e_irq_request(struct fore200e* fore200e) 
}





static int __devinit

fore200e_get_esi(struct fore200e* fore200e)

static int fore200e_get_esi(struct fore200e *fore200e)

{

    struct prom_data* prom = kzalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);

    int ok, i;
@@ -2081,8 +2077,7 @@ fore200e_get_esi(struct fore200e* fore200e) 
}





static int __devinit

fore200e_alloc_rx_buf(struct fore200e* fore200e)

static int fore200e_alloc_rx_buf(struct fore200e *fore200e)

{

    int scheme, magn, nbr, size, i;
@@ -2146,8 +2141,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e) 
}





static int __devinit

fore200e_init_bs_queue(struct fore200e* fore200e)

static int fore200e_init_bs_queue(struct fore200e *fore200e)

{

    int scheme, magn, i;
@@ -2209,8 +2203,7 @@ fore200e_init_bs_queue(struct fore200e* fore200e) 
}





static int __devinit

fore200e_init_rx_queue(struct fore200e* fore200e)

static int fore200e_init_rx_queue(struct fore200e *fore200e)

{

    struct host_rxq*     rxq =  &fore200e->host_rxq;

    struct cp_rxq_entry __iomem * cp_entry;
@@ -2269,8 +2262,7 @@ fore200e_init_rx_queue(struct fore200e* fore200e) 
}





static int __devinit

fore200e_init_tx_queue(struct fore200e* fore200e)

static int fore200e_init_tx_queue(struct fore200e *fore200e)

{

    struct host_txq*     txq =  &fore200e->host_txq;

    struct cp_txq_entry __iomem * cp_entry;
@@ -2332,8 +2324,7 @@ fore200e_init_tx_queue(struct fore200e* fore200e) 
}





static int __devinit

fore200e_init_cmd_queue(struct fore200e* fore200e)

static int fore200e_init_cmd_queue(struct fore200e *fore200e)

{

    struct host_cmdq*     cmdq =  &fore200e->host_cmdq;

    struct cp_cmdq_entry __iomem * cp_entry;
@@ -2374,10 +2365,10 @@ fore200e_init_cmd_queue(struct fore200e* fore200e) 
}





static void __devinit

fore200e_param_bs_queue(struct fore200e* fore200e,

			enum buffer_scheme scheme, enum buffer_magn magn,

			int queue_length, int pool_size, int supply_blksize)

static void fore200e_param_bs_queue(struct fore200e *fore200e,

				    enum buffer_scheme scheme,

				    enum buffer_magn magn, int queue_length,

				    int pool_size, int supply_blksize)

{

    struct bs_spec __iomem * bs_spec = &fore200e->cp_queues->init.bs_spec[ scheme ][ magn ];
@@ -2388,8 +2379,7 @@ fore200e_param_bs_queue(struct fore200e* fore200e, 
}





static int __devinit

fore200e_initialize(struct fore200e* fore200e)

static int fore200e_initialize(struct fore200e *fore200e)

{

    struct cp_queues __iomem * cpq;

    int               ok, scheme, magn;
@@ -2440,8 +2430,7 @@ fore200e_initialize(struct fore200e* fore200e) 
}





static void __devinit

fore200e_monitor_putc(struct fore200e* fore200e, char c)

static void fore200e_monitor_putc(struct fore200e *fore200e, char c)

{

    struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
@@ -2452,8 +2441,7 @@ fore200e_monitor_putc(struct fore200e* fore200e, char c) 
}





static int __devinit

fore200e_monitor_getc(struct fore200e* fore200e)

static int fore200e_monitor_getc(struct fore200e *fore200e)

{

    struct cp_monitor __iomem * monitor = fore200e->cp_monitor;

    unsigned long      timeout = jiffies + msecs_to_jiffies(50);
@@ -2477,8 +2465,7 @@ fore200e_monitor_getc(struct fore200e* fore200e) 
}





static void __devinit

fore200e_monitor_puts(struct fore200e* fore200e, char* str)

static void fore200e_monitor_puts(struct fore200e *fore200e, char *str)

{

    while (*str) {
@@ -2497,8 +2484,7 @@ fore200e_monitor_puts(struct fore200e* fore200e, char* str) 
#define FW_EXT "_ecd.bin2"

#endif



static int __devinit

fore200e_load_and_start_fw(struct fore200e* fore200e)

static int fore200e_load_and_start_fw(struct fore200e *fore200e)

{

    const struct firmware *firmware;

    struct device *device;
@@ -2566,8 +2552,7 @@ fore200e_load_and_start_fw(struct fore200e* fore200e) 
}





static int __devinit

fore200e_register(struct fore200e* fore200e, struct device *parent)

static int fore200e_register(struct fore200e *fore200e, struct device *parent)

{

    struct atm_dev* atm_dev;
@@ -2593,8 +2578,7 @@ fore200e_register(struct fore200e* fore200e, struct device *parent) 
}





static int __devinit

fore200e_init(struct fore200e* fore200e, struct device *parent)

static int fore200e_init(struct fore200e *fore200e, struct device *parent)

{

    if (fore200e_register(fore200e, parent) < 0)

	return -ENODEV;
@@ -2644,7 +2628,7 @@ fore200e_init(struct fore200e* fore200e, struct device *parent) 


#ifdef CONFIG_SBUS

static const struct of_device_id fore200e_sba_match[];

static int __devinit fore200e_sba_probe(struct platform_device *op)

static int fore200e_sba_probe(struct platform_device *op)

{

	const struct of_device_id *match;

	const struct fore200e_bus *bus;
@@ -2681,7 +2665,7 @@ static int __devinit fore200e_sba_probe(struct platform_device *op) 
	return 0;

}



static int __devexit fore200e_sba_remove(struct platform_device *op)

static int fore200e_sba_remove(struct platform_device *op)

{

	struct fore200e *fore200e = dev_get_drvdata(&op->dev);
@@ -2707,13 +2691,13 @@ static struct platform_driver fore200e_sba_driver = { 
		.of_match_table = fore200e_sba_match,

	},

	.probe		= fore200e_sba_probe,

	.remove		= __devexit_p(fore200e_sba_remove),

	.remove		= fore200e_sba_remove,

};

#endif



#ifdef CONFIG_PCI

static int __devinit

fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)

static int fore200e_pca_detect(struct pci_dev *pci_dev,

			       const struct pci_device_id *pci_ent)

{

    const struct fore200e_bus* bus = (struct fore200e_bus*) pci_ent->driver_data;

    struct fore200e* fore200e;
@@ -2766,7 +2750,7 @@ fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent 
}





static void __devexit fore200e_pca_remove_one(struct pci_dev *pci_dev)

static void fore200e_pca_remove_one(struct pci_dev *pci_dev)

{

    struct fore200e *fore200e;
@@ -2789,7 +2773,7 @@ MODULE_DEVICE_TABLE(pci, fore200e_pca_tbl); 
static struct pci_driver fore200e_pca_driver = {

    .name =     "fore_200e",

    .probe =    fore200e_pca_detect,

    .remove =   __devexit_p(fore200e_pca_remove_one),

    .remove =   fore200e_pca_remove_one,

    .id_table = fore200e_pca_tbl,

};

#endif

drivers/atm/he.c

+13 −23
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ __find_vcc(struct he_dev *he_dev, unsigned cid) 
	return NULL;

}



static int __devinit

he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)

static int he_init_one(struct pci_dev *pci_dev,

		       const struct pci_device_id *pci_ent)

{

	struct atm_dev *atm_dev = NULL;

	struct he_dev *he_dev = NULL;
@@ -406,8 +406,7 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent) 
	return err;

}



static void __devexit

he_remove_one (struct pci_dev *pci_dev)

static void he_remove_one(struct pci_dev *pci_dev)

{

	struct atm_dev *atm_dev;

	struct he_dev *he_dev;
@@ -445,8 +444,7 @@ rate_to_atmf(unsigned rate) /* cps to atm forum format */ 
	return (NONZERO | (exp << 9) | (rate & 0x1ff));

}



static void __devinit

he_init_rx_lbfp0(struct he_dev *he_dev)

static void he_init_rx_lbfp0(struct he_dev *he_dev)

{

	unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;

	unsigned lbufs_per_row = he_dev->cells_per_row / he_dev->cells_per_lbuf;
@@ -476,8 +474,7 @@ he_init_rx_lbfp0(struct he_dev *he_dev) 
	he_writel(he_dev, he_dev->r0_numbuffs, RLBF0_C);

}



static void __devinit

he_init_rx_lbfp1(struct he_dev *he_dev)

static void he_init_rx_lbfp1(struct he_dev *he_dev)

{

	unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;

	unsigned lbufs_per_row = he_dev->cells_per_row / he_dev->cells_per_lbuf;
@@ -507,8 +504,7 @@ he_init_rx_lbfp1(struct he_dev *he_dev) 
	he_writel(he_dev, he_dev->r1_numbuffs, RLBF1_C);

}



static void __devinit

he_init_tx_lbfp(struct he_dev *he_dev)

static void he_init_tx_lbfp(struct he_dev *he_dev)

{

	unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;

	unsigned lbufs_per_row = he_dev->cells_per_row / he_dev->cells_per_lbuf;
@@ -537,8 +533,7 @@ he_init_tx_lbfp(struct he_dev *he_dev) 
	he_writel(he_dev, lbufd_index - 1, TLBF_T);

}



static int __devinit

he_init_tpdrq(struct he_dev *he_dev)

static int he_init_tpdrq(struct he_dev *he_dev)

{

	he_dev->tpdrq_base = pci_alloc_consistent(he_dev->pci_dev,

		CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq), &he_dev->tpdrq_phys);
@@ -559,8 +554,7 @@ he_init_tpdrq(struct he_dev *he_dev) 
	return 0;

}



static void __devinit

he_init_cs_block(struct he_dev *he_dev)

static void he_init_cs_block(struct he_dev *he_dev)

{

	unsigned clock, rate, delta;

	int reg;
@@ -655,8 +649,7 @@ he_init_cs_block(struct he_dev *he_dev) 


}



static int __devinit

he_init_cs_block_rcm(struct he_dev *he_dev)

static int he_init_cs_block_rcm(struct he_dev *he_dev)

{

	unsigned (*rategrid)[16][16];

	unsigned rate, delta;
@@ -776,8 +769,7 @@ he_init_cs_block_rcm(struct he_dev *he_dev) 
	return 0;

}



static int __devinit

he_init_group(struct he_dev *he_dev, int group)

static int he_init_group(struct he_dev *he_dev, int group)

{

	struct he_buff *heb, *next;

	dma_addr_t mapping;
@@ -915,8 +907,7 @@ he_init_group(struct he_dev *he_dev, int group) 
	return -ENOMEM;

}



static int __devinit

he_init_irq(struct he_dev *he_dev)

static int he_init_irq(struct he_dev *he_dev)

{

	int i;
@@ -978,8 +969,7 @@ he_init_irq(struct he_dev *he_dev) 
	return 0;

}



static int __devinit

he_start(struct atm_dev *dev)

static int he_start(struct atm_dev *dev)

{

	struct he_dev *he_dev;

	struct pci_dev *pci_dev;
@@ -2879,7 +2869,7 @@ MODULE_DEVICE_TABLE(pci, he_pci_tbl); 
static struct pci_driver he_driver = {

	.name =		"he",

	.probe =	he_init_one,

	.remove =	__devexit_p(he_remove_one),

	.remove =	he_remove_one,

	.id_table =	he_pci_tbl,

};