Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 175 deletions
drivers/atm/ambassador.c
View file @ 6c44512d
...@@ -1507,9 +1507,9 @@ static void do_housekeeping (unsigned long arg) { ...@@ -1507,9 +1507,9 @@ static void do_housekeeping (unsigned long arg) {
/********** creation of communication queues **********/ /********** creation of communication queues **********/
static int __devinit create_queues (amb_dev * dev, unsigned int cmds, static int create_queues(amb_dev *dev, unsigned int cmds, unsigned int txs,
unsigned int txs, unsigned int * rxs, unsigned int *rxs, unsigned int *rx_buffer_sizes)
unsigned int * rx_buffer_sizes) { {
unsigned char pool; unsigned char pool;
size_t total = 0; size_t total = 0;
void * memory; void * memory;
...@@ -1737,8 +1737,9 @@ static int decode_loader_result (loader_command cmd, u32 result) ...@@ -1737,8 +1737,9 @@ static int decode_loader_result (loader_command cmd, u32 result)
return res; return res;
} }
static int __devinit do_loader_command (volatile loader_block * lb, static int do_loader_command(volatile loader_block *lb, const amb_dev *dev,
const amb_dev * dev, loader_command cmd) { loader_command cmd)
{
unsigned long timeout; unsigned long timeout;
...@@ -1793,8 +1794,9 @@ static int __devinit do_loader_command (volatile loader_block * lb, ...@@ -1793,8 +1794,9 @@ static int __devinit do_loader_command (volatile loader_block * lb,
/* loader: determine loader version */ /* loader: determine loader version */
static int __devinit get_loader_version (loader_block * lb, static int get_loader_version(loader_block *lb, const amb_dev *dev,
const amb_dev * dev, u32 * version) { u32 *version)
{
int res; int res;
PRINTD (DBG_FLOW|DBG_LOAD, "get_loader_version"); PRINTD (DBG_FLOW|DBG_LOAD, "get_loader_version");
...@@ -1809,9 +1811,9 @@ static int __devinit get_loader_version (loader_block * lb, ...@@ -1809,9 +1811,9 @@ static int __devinit get_loader_version (loader_block * lb,
/* loader: write memory data blocks */ /* loader: write memory data blocks */
static int __devinit loader_write (loader_block* lb, static int loader_write(loader_block *lb, const amb_dev *dev,
const amb_dev *dev, const struct ihex_binrec *rec)
const struct ihex_binrec *rec) { {
transfer_block * tb = &lb->payload.transfer; transfer_block * tb = &lb->payload.transfer;
PRINTD (DBG_FLOW|DBG_LOAD, "loader_write"); PRINTD (DBG_FLOW|DBG_LOAD, "loader_write");
...@@ -1824,9 +1826,9 @@ static int __devinit loader_write (loader_block* lb, ...@@ -1824,9 +1826,9 @@ static int __devinit loader_write (loader_block* lb,
/* loader: verify memory data blocks */ /* loader: verify memory data blocks */
static int __devinit loader_verify (loader_block * lb, static int loader_verify(loader_block *lb, const amb_dev *dev,
const amb_dev *dev, const struct ihex_binrec *rec)
const struct ihex_binrec *rec) { {
transfer_block * tb = &lb->payload.transfer; transfer_block * tb = &lb->payload.transfer;
int res; int res;
...@@ -1842,8 +1844,8 @@ static int __devinit loader_verify (loader_block * lb, ...@@ -1842,8 +1844,8 @@ static int __devinit loader_verify (loader_block * lb,
/* loader: start microcode */ /* loader: start microcode */
static int __devinit loader_start (loader_block * lb, static int loader_start(loader_block *lb, const amb_dev *dev, u32 address)
const amb_dev * dev, u32 address) { {
PRINTD (DBG_FLOW|DBG_LOAD, "loader_start"); PRINTD (DBG_FLOW|DBG_LOAD, "loader_start");
lb->payload.start = cpu_to_be32 (address); lb->payload.start = cpu_to_be32 (address);
...@@ -1918,7 +1920,8 @@ static int amb_reset (amb_dev * dev, int diags) { ...@@ -1918,7 +1920,8 @@ static int amb_reset (amb_dev * dev, int diags) {
/********** transfer and start the microcode **********/ /********** 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; const struct firmware *fw;
unsigned long start_address; unsigned long start_address;
const struct ihex_binrec *rec; const struct ihex_binrec *rec;
...@@ -1980,7 +1983,8 @@ static inline __be32 bus_addr(void * addr) { ...@@ -1980,7 +1983,8 @@ static inline __be32 bus_addr(void * addr) {
return cpu_to_be32 (virt_to_bus (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; adap_talk_block a;
unsigned char pool; unsigned char pool;
unsigned long timeout; unsigned long timeout;
...@@ -2027,7 +2031,8 @@ static int __devinit amb_talk (amb_dev * dev) { ...@@ -2027,7 +2031,8 @@ static int __devinit amb_talk (amb_dev * dev) {
} }
// get microcode version // get microcode version
static void __devinit amb_ucode_version (amb_dev * dev) { static void amb_ucode_version(amb_dev *dev)
{
u32 major; u32 major;
u32 minor; u32 minor;
command cmd; command cmd;
...@@ -2042,7 +2047,8 @@ static void __devinit amb_ucode_version (amb_dev * dev) { ...@@ -2042,7 +2047,8 @@ static void __devinit amb_ucode_version (amb_dev * dev) {
} }
// get end station address // 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; u32 lower4;
u16 upper2; u16 upper2;
command cmd; command cmd;
...@@ -2088,7 +2094,7 @@ static void fixup_plx_window (amb_dev *dev, loader_block *lb) ...@@ -2088,7 +2094,7 @@ static void fixup_plx_window (amb_dev *dev, loader_block *lb)
return; return;
} }
static int __devinit amb_init (amb_dev * dev) static int amb_init(amb_dev *dev)
{ {
loader_block lb; loader_block lb;
...@@ -2184,7 +2190,8 @@ static void setup_pci_dev(struct pci_dev *pci_dev) ...@@ -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; amb_dev * dev;
int err; int err;
...@@ -2285,7 +2292,7 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_ ...@@ -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; struct amb_dev *dev;
...@@ -2379,7 +2386,7 @@ MODULE_DEVICE_TABLE(pci, amb_pci_tbl); ...@@ -2379,7 +2386,7 @@ MODULE_DEVICE_TABLE(pci, amb_pci_tbl);
static struct pci_driver amb_driver = { static struct pci_driver amb_driver = {
.name = "amb", .name = "amb",
.probe = amb_probe, .probe = amb_probe,
.remove = __devexit_p(amb_remove_one), .remove = amb_remove_one,
.id_table = amb_pci_tbl, .id_table = amb_pci_tbl,
}; };
......
drivers/atm/eni.c
View file @ 6c44512d
...@@ -1567,7 +1567,7 @@ tx_complete++; ...@@ -1567,7 +1567,7 @@ tx_complete++;
/*--------------------------------- entries ---------------------------------*/ /*--------------------------------- entries ---------------------------------*/
static char * const media_name[] __devinitconst = { static char * const media_name[] = {
"MMF", "SMF", "MMF", "03?", /* 0- 3 */ "MMF", "SMF", "MMF", "03?", /* 0- 3 */
"UTP", "05?", "06?", "07?", /* 4- 7 */ "UTP", "05?", "06?", "07?", /* 4- 7 */
"TAXI","09?", "10?", "11?", /* 8-11 */ "TAXI","09?", "10?", "11?", /* 8-11 */
...@@ -1591,7 +1591,7 @@ static char * const media_name[] __devinitconst = { ...@@ -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; struct eni_dev *eni_dev;
unsigned char tonga; unsigned char tonga;
...@@ -1683,7 +1683,7 @@ static int __devinit get_esi_asic(struct atm_dev *dev) ...@@ -1683,7 +1683,7 @@ static int __devinit get_esi_asic(struct atm_dev *dev)
#undef GET_SEPROM #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; void __iomem *mac_base;
int i; int i;
...@@ -1694,7 +1694,7 @@ static int __devinit get_esi_fpga(struct atm_dev *dev, void __iomem *base) ...@@ -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 midway_eprom __iomem *eprom;
struct eni_dev *eni_dev; struct eni_dev *eni_dev;
...@@ -1797,7 +1797,7 @@ static void eni_do_release(struct atm_dev *dev) ...@@ -1797,7 +1797,7 @@ static void eni_do_release(struct atm_dev *dev)
iounmap(ed->ioaddr); 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; struct eni_dev *eni_dev;
...@@ -2226,7 +2226,7 @@ static const struct atmdev_ops ops = { ...@@ -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) const struct pci_device_id *ent)
{ {
struct atm_dev *dev; struct atm_dev *dev;
...@@ -2292,7 +2292,7 @@ static struct pci_device_id eni_pci_tbl[] = { ...@@ -2292,7 +2292,7 @@ static struct pci_device_id eni_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci,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 atm_dev *dev = pci_get_drvdata(pdev);
struct eni_dev *ed = ENI_DEV(dev); struct eni_dev *ed = ENI_DEV(dev);
...@@ -2310,7 +2310,7 @@ static struct pci_driver eni_driver = { ...@@ -2310,7 +2310,7 @@ static struct pci_driver eni_driver = {
.name = DEV_LABEL, .name = DEV_LABEL,
.id_table = eni_pci_tbl, .id_table = eni_pci_tbl,
.probe = eni_init_one, .probe = eni_init_one,
.remove = __devexit_p(eni_remove_one), .remove = eni_remove_one,
}; };
......
drivers/atm/firestream.c
View file @ 6c44512d
...@@ -252,7 +252,7 @@ struct reginit_item { ...@@ -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 }, { PHY_CLEARALL, 0x40 },
{ 0x12, 0x0001 }, { 0x12, 0x0001 },
{ 0x13, 0x7605 }, { 0x13, 0x7605 },
...@@ -1295,7 +1295,7 @@ static const struct atmdev_ops ops = { ...@@ -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; u32 tint;
...@@ -1319,13 +1319,13 @@ static void __devinit undocumented_pci_fix (struct pci_dev *pdev) ...@@ -1319,13 +1319,13 @@ static void __devinit undocumented_pci_fix (struct pci_dev *pdev)
* PHY routines * * 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, submit_command (dev, &dev->hp_txq, QE_CMD_PRP_WR | QE_CMD_IMM_INQ,
regnum, val, 0); 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; int i;
...@@ -1381,7 +1381,7 @@ static void reset_chip (struct fs_dev *dev) ...@@ -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; void *t;
...@@ -1398,8 +1398,8 @@ static void __devinit *aligned_kmalloc (int size, gfp_t flags, int alignment) ...@@ -1398,8 +1398,8 @@ static void __devinit *aligned_kmalloc (int size, gfp_t flags, int alignment)
return NULL; return NULL;
} }
static int __devinit init_q (struct fs_dev *dev, static int init_q(struct fs_dev *dev, struct queue *txq, int queue,
struct queue *txq, int queue, int nentries, int is_rq) int nentries, int is_rq)
{ {
int sz = nentries * sizeof (struct FS_QENTRY); int sz = nentries * sizeof (struct FS_QENTRY);
struct FS_QENTRY *p; struct FS_QENTRY *p;
...@@ -1434,8 +1434,8 @@ static int __devinit init_q (struct fs_dev *dev, ...@@ -1434,8 +1434,8 @@ static int __devinit init_q (struct fs_dev *dev,
} }
static int __devinit init_fp (struct fs_dev *dev, static int init_fp(struct fs_dev *dev, struct freepool *fp, int queue,
struct freepool *fp, int queue, int bufsize, int nr_buffers) int bufsize, int nr_buffers)
{ {
func_enter (); func_enter ();
...@@ -1528,7 +1528,7 @@ static void top_off_fp (struct fs_dev *dev, struct freepool *fp, ...@@ -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); 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 (); func_enter ();
...@@ -1544,7 +1544,7 @@ static void __devexit free_queue (struct fs_dev *dev, struct queue *txq) ...@@ -1544,7 +1544,7 @@ static void __devexit free_queue (struct fs_dev *dev, struct queue *txq)
func_exit (); 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 (); func_enter ();
...@@ -1662,7 +1662,7 @@ static void fs_poll (unsigned long data) ...@@ -1662,7 +1662,7 @@ static void fs_poll (unsigned long data)
} }
#endif #endif
static int __devinit fs_init (struct fs_dev *dev) static int fs_init(struct fs_dev *dev)
{ {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
int isr, to; int isr, to;
...@@ -1897,7 +1897,7 @@ static int __devinit fs_init (struct fs_dev *dev) ...@@ -1897,7 +1897,7 @@ static int __devinit fs_init (struct fs_dev *dev)
return 1; 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) const struct pci_device_id *ent)
{ {
struct atm_dev *atm_dev; struct atm_dev *atm_dev;
...@@ -1934,7 +1934,7 @@ static int __devinit firestream_init_one (struct pci_dev *pci_dev, ...@@ -1934,7 +1934,7 @@ static int __devinit firestream_init_one (struct pci_dev *pci_dev,
return -ENODEV; return -ENODEV;
} }
static void __devexit firestream_remove_one (struct pci_dev *pdev) static void firestream_remove_one(struct pci_dev *pdev)
{ {
int i; int i;
struct fs_dev *dev, *nxtdev; struct fs_dev *dev, *nxtdev;
...@@ -2038,7 +2038,7 @@ static struct pci_driver firestream_driver = { ...@@ -2038,7 +2038,7 @@ static struct pci_driver firestream_driver = {
.name = "firestream", .name = "firestream",
.id_table = firestream_pci_tbl, .id_table = firestream_pci_tbl,
.probe = firestream_init_one, .probe = firestream_init_one,
.remove = __devexit_p(firestream_remove_one), .remove = firestream_remove_one,
}; };
static int __init firestream_init_module (void) static int __init firestream_init_module (void)
......
drivers/atm/fore200e.c
View file @ 6c44512d
...@@ -527,8 +527,7 @@ fore200e_pca_reset(struct fore200e* fore200e) ...@@ -527,8 +527,7 @@ fore200e_pca_reset(struct fore200e* fore200e)
} }
static int __devinit static int fore200e_pca_map(struct fore200e* fore200e)
fore200e_pca_map(struct fore200e* fore200e)
{ {
DPRINTK(2, "device %s being mapped in memory\n", fore200e->name); DPRINTK(2, "device %s being mapped in memory\n", fore200e->name);
...@@ -561,8 +560,7 @@ fore200e_pca_unmap(struct fore200e* fore200e) ...@@ -561,8 +560,7 @@ fore200e_pca_unmap(struct fore200e* fore200e)
} }
static int __devinit static int fore200e_pca_configure(struct fore200e *fore200e)
fore200e_pca_configure(struct fore200e* fore200e)
{ {
struct pci_dev* pci_dev = (struct pci_dev*)fore200e->bus_dev; struct pci_dev* pci_dev = (struct pci_dev*)fore200e->bus_dev;
u8 master_ctrl, latency; u8 master_ctrl, latency;
...@@ -2028,8 +2026,7 @@ fore200e_change_qos(struct atm_vcc* vcc,struct atm_qos* qos, int flags) ...@@ -2028,8 +2026,7 @@ fore200e_change_qos(struct atm_vcc* vcc,struct atm_qos* qos, int flags)
} }
static int __devinit static int fore200e_irq_request(struct fore200e *fore200e)
fore200e_irq_request(struct fore200e* fore200e)
{ {
if (request_irq(fore200e->irq, fore200e_interrupt, IRQF_SHARED, fore200e->name, fore200e->atm_dev) < 0) { 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) ...@@ -2051,8 +2048,7 @@ fore200e_irq_request(struct fore200e* fore200e)
} }
static int __devinit static int fore200e_get_esi(struct fore200e *fore200e)
fore200e_get_esi(struct fore200e* fore200e)
{ {
struct prom_data* prom = kzalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA); struct prom_data* prom = kzalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
int ok, i; int ok, i;
...@@ -2081,8 +2077,7 @@ fore200e_get_esi(struct fore200e* fore200e) ...@@ -2081,8 +2077,7 @@ fore200e_get_esi(struct fore200e* fore200e)
} }
static int __devinit static int fore200e_alloc_rx_buf(struct fore200e *fore200e)
fore200e_alloc_rx_buf(struct fore200e* fore200e)
{ {
int scheme, magn, nbr, size, i; int scheme, magn, nbr, size, i;
...@@ -2146,8 +2141,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e) ...@@ -2146,8 +2141,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e)
} }
static int __devinit static int fore200e_init_bs_queue(struct fore200e *fore200e)
fore200e_init_bs_queue(struct fore200e* fore200e)
{ {
int scheme, magn, i; int scheme, magn, i;
...@@ -2209,8 +2203,7 @@ fore200e_init_bs_queue(struct fore200e* fore200e) ...@@ -2209,8 +2203,7 @@ fore200e_init_bs_queue(struct fore200e* fore200e)
} }
static int __devinit static int fore200e_init_rx_queue(struct fore200e *fore200e)
fore200e_init_rx_queue(struct fore200e* fore200e)
{ {
struct host_rxq* rxq = &fore200e->host_rxq; struct host_rxq* rxq = &fore200e->host_rxq;
struct cp_rxq_entry __iomem * cp_entry; struct cp_rxq_entry __iomem * cp_entry;
...@@ -2269,8 +2262,7 @@ fore200e_init_rx_queue(struct fore200e* fore200e) ...@@ -2269,8 +2262,7 @@ fore200e_init_rx_queue(struct fore200e* fore200e)
} }
static int __devinit static int fore200e_init_tx_queue(struct fore200e *fore200e)
fore200e_init_tx_queue(struct fore200e* fore200e)
{ {
struct host_txq* txq = &fore200e->host_txq; struct host_txq* txq = &fore200e->host_txq;
struct cp_txq_entry __iomem * cp_entry; struct cp_txq_entry __iomem * cp_entry;
...@@ -2332,8 +2324,7 @@ fore200e_init_tx_queue(struct fore200e* fore200e) ...@@ -2332,8 +2324,7 @@ fore200e_init_tx_queue(struct fore200e* fore200e)
} }
static int __devinit static int fore200e_init_cmd_queue(struct fore200e *fore200e)
fore200e_init_cmd_queue(struct fore200e* fore200e)
{ {
struct host_cmdq* cmdq = &fore200e->host_cmdq; struct host_cmdq* cmdq = &fore200e->host_cmdq;
struct cp_cmdq_entry __iomem * cp_entry; struct cp_cmdq_entry __iomem * cp_entry;
...@@ -2374,10 +2365,10 @@ fore200e_init_cmd_queue(struct fore200e* fore200e) ...@@ -2374,10 +2365,10 @@ fore200e_init_cmd_queue(struct fore200e* fore200e)
} }
static void __devinit static void fore200e_param_bs_queue(struct fore200e *fore200e,
fore200e_param_bs_queue(struct fore200e* fore200e, enum buffer_scheme scheme,
enum buffer_scheme scheme, enum buffer_magn magn, enum buffer_magn magn, int queue_length,
int queue_length, int pool_size, int supply_blksize) int pool_size, int supply_blksize)
{ {
struct bs_spec __iomem * bs_spec = &fore200e->cp_queues->init.bs_spec[ scheme ][ magn ]; 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, ...@@ -2388,8 +2379,7 @@ fore200e_param_bs_queue(struct fore200e* fore200e,
} }
static int __devinit static int fore200e_initialize(struct fore200e *fore200e)
fore200e_initialize(struct fore200e* fore200e)
{ {
struct cp_queues __iomem * cpq; struct cp_queues __iomem * cpq;
int ok, scheme, magn; int ok, scheme, magn;
...@@ -2440,8 +2430,7 @@ fore200e_initialize(struct fore200e* fore200e) ...@@ -2440,8 +2430,7 @@ fore200e_initialize(struct fore200e* fore200e)
} }
static void __devinit static void fore200e_monitor_putc(struct fore200e *fore200e, char c)
fore200e_monitor_putc(struct fore200e* fore200e, char c)
{ {
struct cp_monitor __iomem * monitor = fore200e->cp_monitor; struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
...@@ -2452,8 +2441,7 @@ fore200e_monitor_putc(struct fore200e* fore200e, char c) ...@@ -2452,8 +2441,7 @@ fore200e_monitor_putc(struct fore200e* fore200e, char c)
} }
static int __devinit static int fore200e_monitor_getc(struct fore200e *fore200e)
fore200e_monitor_getc(struct fore200e* fore200e)
{ {
struct cp_monitor __iomem * monitor = fore200e->cp_monitor; struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
unsigned long timeout = jiffies + msecs_to_jiffies(50); unsigned long timeout = jiffies + msecs_to_jiffies(50);
...@@ -2477,8 +2465,7 @@ fore200e_monitor_getc(struct fore200e* fore200e) ...@@ -2477,8 +2465,7 @@ fore200e_monitor_getc(struct fore200e* fore200e)
} }
static void __devinit static void fore200e_monitor_puts(struct fore200e *fore200e, char *str)
fore200e_monitor_puts(struct fore200e* fore200e, char* str)
{ {
while (*str) { while (*str) {
...@@ -2497,8 +2484,7 @@ fore200e_monitor_puts(struct fore200e* fore200e, char* str) ...@@ -2497,8 +2484,7 @@ fore200e_monitor_puts(struct fore200e* fore200e, char* str)
#define FW_EXT "_ecd.bin2" #define FW_EXT "_ecd.bin2"
#endif #endif
static int __devinit static int fore200e_load_and_start_fw(struct fore200e *fore200e)
fore200e_load_and_start_fw(struct fore200e* fore200e)
{ {
const struct firmware *firmware; const struct firmware *firmware;
struct device *device; struct device *device;
...@@ -2566,8 +2552,7 @@ fore200e_load_and_start_fw(struct fore200e* fore200e) ...@@ -2566,8 +2552,7 @@ fore200e_load_and_start_fw(struct fore200e* fore200e)
} }
static int __devinit static int fore200e_register(struct fore200e *fore200e, struct device *parent)
fore200e_register(struct fore200e* fore200e, struct device *parent)
{ {
struct atm_dev* atm_dev; struct atm_dev* atm_dev;
...@@ -2593,8 +2578,7 @@ fore200e_register(struct fore200e* fore200e, struct device *parent) ...@@ -2593,8 +2578,7 @@ fore200e_register(struct fore200e* fore200e, struct device *parent)
} }
static int __devinit static int fore200e_init(struct fore200e *fore200e, struct device *parent)
fore200e_init(struct fore200e* fore200e, struct device *parent)
{ {
if (fore200e_register(fore200e, parent) < 0) if (fore200e_register(fore200e, parent) < 0)
return -ENODEV; return -ENODEV;
...@@ -2644,7 +2628,7 @@ fore200e_init(struct fore200e* fore200e, struct device *parent) ...@@ -2644,7 +2628,7 @@ fore200e_init(struct fore200e* fore200e, struct device *parent)
#ifdef CONFIG_SBUS #ifdef CONFIG_SBUS
static const struct of_device_id fore200e_sba_match[]; 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 of_device_id *match;
const struct fore200e_bus *bus; const struct fore200e_bus *bus;
...@@ -2681,7 +2665,7 @@ static int __devinit fore200e_sba_probe(struct platform_device *op) ...@@ -2681,7 +2665,7 @@ static int __devinit fore200e_sba_probe(struct platform_device *op)
return 0; 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); struct fore200e *fore200e = dev_get_drvdata(&op->dev);
...@@ -2707,13 +2691,13 @@ static struct platform_driver fore200e_sba_driver = { ...@@ -2707,13 +2691,13 @@ static struct platform_driver fore200e_sba_driver = {
.of_match_table = fore200e_sba_match, .of_match_table = fore200e_sba_match,
}, },
.probe = fore200e_sba_probe, .probe = fore200e_sba_probe,
.remove = __devexit_p(fore200e_sba_remove), .remove = fore200e_sba_remove,
}; };
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int __devinit static int fore200e_pca_detect(struct pci_dev *pci_dev,
fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent) const struct pci_device_id *pci_ent)
{ {
const struct fore200e_bus* bus = (struct fore200e_bus*) pci_ent->driver_data; const struct fore200e_bus* bus = (struct fore200e_bus*) pci_ent->driver_data;
struct fore200e* fore200e; struct fore200e* fore200e;
...@@ -2766,7 +2750,7 @@ fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent ...@@ -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; struct fore200e *fore200e;
...@@ -2789,7 +2773,7 @@ MODULE_DEVICE_TABLE(pci, fore200e_pca_tbl); ...@@ -2789,7 +2773,7 @@ MODULE_DEVICE_TABLE(pci, fore200e_pca_tbl);
static struct pci_driver fore200e_pca_driver = { static struct pci_driver fore200e_pca_driver = {
.name = "fore_200e", .name = "fore_200e",
.probe = fore200e_pca_detect, .probe = fore200e_pca_detect,
.remove = __devexit_p(fore200e_pca_remove_one), .remove = fore200e_pca_remove_one,
.id_table = fore200e_pca_tbl, .id_table = fore200e_pca_tbl,
}; };
#endif #endif
......
drivers/atm/he.c
View file @ 6c44512d
...@@ -349,8 +349,8 @@ __find_vcc(struct he_dev *he_dev, unsigned cid) ...@@ -349,8 +349,8 @@ __find_vcc(struct he_dev *he_dev, unsigned cid)
return NULL; return NULL;
} }
static int __devinit static int he_init_one(struct pci_dev *pci_dev,
he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent) const struct pci_device_id *pci_ent)
{ {
struct atm_dev *atm_dev = NULL; struct atm_dev *atm_dev = NULL;
struct he_dev *he_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) ...@@ -406,8 +406,7 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
return err; return err;
} }
static void __devexit static void he_remove_one(struct pci_dev *pci_dev)
he_remove_one (struct pci_dev *pci_dev)
{ {
struct atm_dev *atm_dev; struct atm_dev *atm_dev;
struct he_dev *he_dev; struct he_dev *he_dev;
...@@ -445,8 +444,7 @@ rate_to_atmf(unsigned rate) /* cps to atm forum format */ ...@@ -445,8 +444,7 @@ rate_to_atmf(unsigned rate) /* cps to atm forum format */
return (NONZERO | (exp << 9) | (rate & 0x1ff)); return (NONZERO | (exp << 9) | (rate & 0x1ff));
} }
static void __devinit static void he_init_rx_lbfp0(struct he_dev *he_dev)
he_init_rx_lbfp0(struct he_dev *he_dev)
{ {
unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count; unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
unsigned lbufs_per_row = he_dev->cells_per_row / he_dev->cells_per_lbuf; 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) ...@@ -476,8 +474,7 @@ he_init_rx_lbfp0(struct he_dev *he_dev)
he_writel(he_dev, he_dev->r0_numbuffs, RLBF0_C); he_writel(he_dev, he_dev->r0_numbuffs, RLBF0_C);
} }
static void __devinit static void he_init_rx_lbfp1(struct he_dev *he_dev)
he_init_rx_lbfp1(struct he_dev *he_dev)
{ {
unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count; unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
unsigned lbufs_per_row = he_dev->cells_per_row / he_dev->cells_per_lbuf; 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) ...@@ -507,8 +504,7 @@ he_init_rx_lbfp1(struct he_dev *he_dev)
he_writel(he_dev, he_dev->r1_numbuffs, RLBF1_C); he_writel(he_dev, he_dev->r1_numbuffs, RLBF1_C);
} }
static void __devinit static void he_init_tx_lbfp(struct he_dev *he_dev)
he_init_tx_lbfp(struct he_dev *he_dev)
{ {
unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count; unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
unsigned lbufs_per_row = he_dev->cells_per_row / he_dev->cells_per_lbuf; 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) ...@@ -537,8 +533,7 @@ he_init_tx_lbfp(struct he_dev *he_dev)
he_writel(he_dev, lbufd_index - 1, TLBF_T); he_writel(he_dev, lbufd_index - 1, TLBF_T);
} }
static int __devinit static int he_init_tpdrq(struct he_dev *he_dev)
he_init_tpdrq(struct he_dev *he_dev)
{ {
he_dev->tpdrq_base = pci_alloc_consistent(he_dev->pci_dev, he_dev->tpdrq_base = pci_alloc_consistent(he_dev->pci_dev,
CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq), &he_dev->tpdrq_phys); CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq), &he_dev->tpdrq_phys);
...@@ -559,8 +554,7 @@ he_init_tpdrq(struct he_dev *he_dev) ...@@ -559,8 +554,7 @@ he_init_tpdrq(struct he_dev *he_dev)
return 0; return 0;
} }
static void __devinit static void he_init_cs_block(struct he_dev *he_dev)
he_init_cs_block(struct he_dev *he_dev)
{ {
unsigned clock, rate, delta; unsigned clock, rate, delta;
int reg; int reg;
...@@ -655,8 +649,7 @@ he_init_cs_block(struct he_dev *he_dev) ...@@ -655,8 +649,7 @@ he_init_cs_block(struct he_dev *he_dev)
} }
static int __devinit static int he_init_cs_block_rcm(struct he_dev *he_dev)
he_init_cs_block_rcm(struct he_dev *he_dev)
{ {
unsigned (*rategrid)[16][16]; unsigned (*rategrid)[16][16];
unsigned rate, delta; unsigned rate, delta;
...@@ -776,8 +769,7 @@ he_init_cs_block_rcm(struct he_dev *he_dev) ...@@ -776,8 +769,7 @@ he_init_cs_block_rcm(struct he_dev *he_dev)
return 0; return 0;
} }
static int __devinit static int he_init_group(struct he_dev *he_dev, int group)
he_init_group(struct he_dev *he_dev, int group)
{ {
struct he_buff *heb, *next; struct he_buff *heb, *next;
dma_addr_t mapping; dma_addr_t mapping;
...@@ -915,8 +907,7 @@ he_init_group(struct he_dev *he_dev, int group) ...@@ -915,8 +907,7 @@ he_init_group(struct he_dev *he_dev, int group)
return -ENOMEM; return -ENOMEM;
} }
static int __devinit static int he_init_irq(struct he_dev *he_dev)
he_init_irq(struct he_dev *he_dev)
{ {
int i; int i;
...@@ -978,8 +969,7 @@ he_init_irq(struct he_dev *he_dev) ...@@ -978,8 +969,7 @@ he_init_irq(struct he_dev *he_dev)
return 0; return 0;
} }
static int __devinit static int he_start(struct atm_dev *dev)
he_start(struct atm_dev *dev)
{ {
struct he_dev *he_dev; struct he_dev *he_dev;
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
...@@ -2879,7 +2869,7 @@ MODULE_DEVICE_TABLE(pci, he_pci_tbl); ...@@ -2879,7 +2869,7 @@ MODULE_DEVICE_TABLE(pci, he_pci_tbl);
static struct pci_driver he_driver = { static struct pci_driver he_driver = {
.name = "he", .name = "he",
.probe = he_init_one, .probe = he_init_one,
.remove = __devexit_p(he_remove_one), .remove = he_remove_one,
.id_table = he_pci_tbl, .id_table = he_pci_tbl,
}; };
......
drivers/atm/horizon.c
View file @ 6c44512d
...@@ -1789,7 +1789,7 @@ static void CLOCK_IT (const hrz_dev *dev, u32 ctrl) ...@@ -1789,7 +1789,7 @@ static void CLOCK_IT (const hrz_dev *dev, u32 ctrl)
WRITE_IT_WAIT(dev, ctrl | SEEPROM_SK); WRITE_IT_WAIT(dev, ctrl | SEEPROM_SK);
} }
static u16 __devinit read_bia (const hrz_dev * dev, u16 addr) static u16 read_bia(const hrz_dev *dev, u16 addr)
{ {
u32 ctrl = rd_regl (dev, CONTROL_0_REG); u32 ctrl = rd_regl (dev, CONTROL_0_REG);
...@@ -1845,7 +1845,8 @@ static u16 __devinit read_bia (const hrz_dev * dev, u16 addr) ...@@ -1845,7 +1845,8 @@ static u16 __devinit read_bia (const hrz_dev * dev, u16 addr)
/********** initialise a card **********/ /********** initialise a card **********/
static int __devinit hrz_init (hrz_dev * dev) { static int hrz_init(hrz_dev *dev)
{
int onefivefive; int onefivefive;
u16 chan; u16 chan;
...@@ -2681,7 +2682,8 @@ static const struct atmdev_ops hrz_ops = { ...@@ -2681,7 +2682,8 @@ static const struct atmdev_ops hrz_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent) static int hrz_probe(struct pci_dev *pci_dev,
const struct pci_device_id *pci_ent)
{ {
hrz_dev * dev; hrz_dev * dev;
int err = 0; int err = 0;
...@@ -2836,7 +2838,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ ...@@ -2836,7 +2838,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_
goto out; goto out;
} }
static void __devexit hrz_remove_one(struct pci_dev *pci_dev) static void hrz_remove_one(struct pci_dev *pci_dev)
{ {
hrz_dev *dev; hrz_dev *dev;
...@@ -2901,7 +2903,7 @@ MODULE_DEVICE_TABLE(pci, hrz_pci_tbl); ...@@ -2901,7 +2903,7 @@ MODULE_DEVICE_TABLE(pci, hrz_pci_tbl);
static struct pci_driver hrz_driver = { static struct pci_driver hrz_driver = {
.name = "horizon", .name = "horizon",
.probe = hrz_probe, .probe = hrz_probe,
.remove = __devexit_p(hrz_remove_one), .remove = hrz_remove_one,
.id_table = hrz_pci_tbl, .id_table = hrz_pci_tbl,
}; };
......
drivers/atm/idt77252.c
View file @ 6c44512d
...@@ -3109,8 +3109,7 @@ deinit_card(struct idt77252_dev *card) ...@@ -3109,8 +3109,7 @@ deinit_card(struct idt77252_dev *card)
} }
static void __devinit static void init_sram(struct idt77252_dev *card)
init_sram(struct idt77252_dev *card)
{ {
int i; int i;
...@@ -3257,8 +3256,7 @@ init_sram(struct idt77252_dev *card) ...@@ -3257,8 +3256,7 @@ init_sram(struct idt77252_dev *card)
IPRINTK("%s: SRAM initialization complete.\n", card->name); IPRINTK("%s: SRAM initialization complete.\n", card->name);
} }
static int __devinit static int init_card(struct atm_dev *dev)
init_card(struct atm_dev *dev)
{ {
struct idt77252_dev *card = dev->dev_data; struct idt77252_dev *card = dev->dev_data;
struct pci_dev *pcidev = card->pcidev; struct pci_dev *pcidev = card->pcidev;
...@@ -3537,8 +3535,7 @@ init_card(struct atm_dev *dev) ...@@ -3537,8 +3535,7 @@ init_card(struct atm_dev *dev)
/*****************************************************************************/ /*****************************************************************************/
static int __devinit static int idt77252_preset(struct idt77252_dev *card)
idt77252_preset(struct idt77252_dev *card)
{ {
u16 pci_command; u16 pci_command;
...@@ -3579,8 +3576,7 @@ idt77252_preset(struct idt77252_dev *card) ...@@ -3579,8 +3576,7 @@ idt77252_preset(struct idt77252_dev *card)
} }
static unsigned long __devinit static unsigned long probe_sram(struct idt77252_dev *card)
probe_sram(struct idt77252_dev *card)
{ {
u32 data, addr; u32 data, addr;
...@@ -3601,8 +3597,8 @@ probe_sram(struct idt77252_dev *card) ...@@ -3601,8 +3597,8 @@ probe_sram(struct idt77252_dev *card)
return addr * sizeof(u32); return addr * sizeof(u32);
} }
static int __devinit static int idt77252_init_one(struct pci_dev *pcidev,
idt77252_init_one(struct pci_dev *pcidev, const struct pci_device_id *id) const struct pci_device_id *id)
{ {
static struct idt77252_dev **last = &idt77252_chain; static struct idt77252_dev **last = &idt77252_chain;
static int index = 0; static int index = 0;
......
drivers/atm/iphase.c
View file @ 6c44512d
...@@ -2299,7 +2299,7 @@ static int reset_sar(struct atm_dev *dev) ...@@ -2299,7 +2299,7 @@ static int reset_sar(struct atm_dev *dev)
} }
static int __devinit ia_init(struct atm_dev *dev) static int ia_init(struct atm_dev *dev)
{ {
IADEV *iadev; IADEV *iadev;
unsigned long real_base; unsigned long real_base;
...@@ -2492,7 +2492,7 @@ static void ia_free_rx(IADEV *iadev) ...@@ -2492,7 +2492,7 @@ static void ia_free_rx(IADEV *iadev)
iadev->rx_dle_dma); iadev->rx_dle_dma);
} }
static int __devinit ia_start(struct atm_dev *dev) static int ia_start(struct atm_dev *dev)
{ {
IADEV *iadev; IADEV *iadev;
int error; int error;
...@@ -3168,8 +3168,7 @@ static const struct atmdev_ops ops = { ...@@ -3168,8 +3168,7 @@ static const struct atmdev_ops ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __devinit ia_init_one(struct pci_dev *pdev, static int ia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct atm_dev *dev; struct atm_dev *dev;
IADEV *iadev; IADEV *iadev;
...@@ -3229,7 +3228,7 @@ static int __devinit ia_init_one(struct pci_dev *pdev, ...@@ -3229,7 +3228,7 @@ static int __devinit ia_init_one(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit ia_remove_one(struct pci_dev *pdev) static void ia_remove_one(struct pci_dev *pdev)
{ {
struct atm_dev *dev = pci_get_drvdata(pdev); struct atm_dev *dev = pci_get_drvdata(pdev);
IADEV *iadev = INPH_IA_DEV(dev); IADEV *iadev = INPH_IA_DEV(dev);
...@@ -3270,7 +3269,7 @@ static struct pci_driver ia_driver = { ...@@ -3270,7 +3269,7 @@ static struct pci_driver ia_driver = {
.name = DEV_LABEL, .name = DEV_LABEL,
.id_table = ia_pci_tbl, .id_table = ia_pci_tbl,
.probe = ia_init_one, .probe = ia_init_one,
.remove = __devexit_p(ia_remove_one), .remove = ia_remove_one,
}; };
static int __init ia_module_init(void) static int __init ia_module_init(void)
......
drivers/atm/lanai.c
View file @ 6c44512d
...@@ -551,8 +551,8 @@ static inline void sram_write(const struct lanai_dev *lanai, ...@@ -551,8 +551,8 @@ static inline void sram_write(const struct lanai_dev *lanai,
writel(val, sram_addr(lanai, offset)); writel(val, sram_addr(lanai, offset));
} }
static int __devinit sram_test_word(const struct lanai_dev *lanai, static int sram_test_word(const struct lanai_dev *lanai, int offset,
int offset, u32 pattern) u32 pattern)
{ {
u32 readback; u32 readback;
sram_write(lanai, pattern, offset); sram_write(lanai, pattern, offset);
...@@ -566,7 +566,7 @@ static int __devinit sram_test_word(const struct lanai_dev *lanai, ...@@ -566,7 +566,7 @@ static int __devinit sram_test_word(const struct lanai_dev *lanai,
return -EIO; return -EIO;
} }
static int __devinit sram_test_pass(const struct lanai_dev *lanai, u32 pattern) static int sram_test_pass(const struct lanai_dev *lanai, u32 pattern)
{ {
int offset, result = 0; int offset, result = 0;
for (offset = 0; offset < SRAM_BYTES && result == 0; offset += 4) for (offset = 0; offset < SRAM_BYTES && result == 0; offset += 4)
...@@ -574,7 +574,7 @@ static int __devinit sram_test_pass(const struct lanai_dev *lanai, u32 pattern) ...@@ -574,7 +574,7 @@ static int __devinit sram_test_pass(const struct lanai_dev *lanai, u32 pattern)
return result; return result;
} }
static int __devinit sram_test_and_clear(const struct lanai_dev *lanai) static int sram_test_and_clear(const struct lanai_dev *lanai)
{ {
#ifdef FULL_MEMORY_TEST #ifdef FULL_MEMORY_TEST
int result; int result;
...@@ -860,7 +860,7 @@ static inline void aal0_buffer_free(struct lanai_dev *lanai) ...@@ -860,7 +860,7 @@ static inline void aal0_buffer_free(struct lanai_dev *lanai)
#ifndef READ_EEPROM #ifndef READ_EEPROM
/* Stub functions to use if EEPROM reading is disabled */ /* Stub functions to use if EEPROM reading is disabled */
static int __devinit eeprom_read(struct lanai_dev *lanai) static int eeprom_read(struct lanai_dev *lanai)
{ {
printk(KERN_INFO DEV_LABEL "(itf %d): *NOT* reading EEPROM\n", printk(KERN_INFO DEV_LABEL "(itf %d): *NOT* reading EEPROM\n",
lanai->number); lanai->number);
...@@ -868,7 +868,7 @@ static int __devinit eeprom_read(struct lanai_dev *lanai) ...@@ -868,7 +868,7 @@ static int __devinit eeprom_read(struct lanai_dev *lanai)
return 0; return 0;
} }
static int __devinit eeprom_validate(struct lanai_dev *lanai) static int eeprom_validate(struct lanai_dev *lanai)
{ {
lanai->serialno = 0; lanai->serialno = 0;
lanai->magicno = EEPROM_MAGIC_VALUE; lanai->magicno = EEPROM_MAGIC_VALUE;
...@@ -877,7 +877,7 @@ static int __devinit eeprom_validate(struct lanai_dev *lanai) ...@@ -877,7 +877,7 @@ static int __devinit eeprom_validate(struct lanai_dev *lanai)
#else /* READ_EEPROM */ #else /* READ_EEPROM */
static int __devinit eeprom_read(struct lanai_dev *lanai) static int eeprom_read(struct lanai_dev *lanai)
{ {
int i, address; int i, address;
u8 data; u8 data;
...@@ -953,7 +953,7 @@ static inline u32 eeprom_be4(const struct lanai_dev *lanai, int address) ...@@ -953,7 +953,7 @@ static inline u32 eeprom_be4(const struct lanai_dev *lanai, int address)
} }
/* Checksum/validate EEPROM contents */ /* Checksum/validate EEPROM contents */
static int __devinit eeprom_validate(struct lanai_dev *lanai) static int eeprom_validate(struct lanai_dev *lanai)
{ {
int i, s; int i, s;
u32 v; u32 v;
...@@ -1448,7 +1448,7 @@ static void vcc_rx_aal0(struct lanai_dev *lanai) ...@@ -1448,7 +1448,7 @@ static void vcc_rx_aal0(struct lanai_dev *lanai)
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#endif #endif
static int __devinit vcc_table_allocate(struct lanai_dev *lanai) static int vcc_table_allocate(struct lanai_dev *lanai)
{ {
#ifdef VCCTABLE_GETFREEPAGE #ifdef VCCTABLE_GETFREEPAGE
APRINTK((lanai->num_vci) * sizeof(struct lanai_vcc *) <= PAGE_SIZE, APRINTK((lanai->num_vci) * sizeof(struct lanai_vcc *) <= PAGE_SIZE,
...@@ -1588,7 +1588,7 @@ static void lanai_reset(struct lanai_dev *lanai) ...@@ -1588,7 +1588,7 @@ static void lanai_reset(struct lanai_dev *lanai)
/* /*
* Allocate service buffer and tell card about it * Allocate service buffer and tell card about it
*/ */
static int __devinit service_buffer_allocate(struct lanai_dev *lanai) static int service_buffer_allocate(struct lanai_dev *lanai)
{ {
lanai_buf_allocate(&lanai->service, SERVICE_ENTRIES * 4, 8, lanai_buf_allocate(&lanai->service, SERVICE_ENTRIES * 4, 8,
lanai->pci); lanai->pci);
...@@ -1942,7 +1942,7 @@ static int check_board_id_and_rev(const char *name, u32 val, int *revp) ...@@ -1942,7 +1942,7 @@ static int check_board_id_and_rev(const char *name, u32 val, int *revp)
/* -------------------- PCI INITIALIZATION/SHUTDOWN: */ /* -------------------- PCI INITIALIZATION/SHUTDOWN: */
static int __devinit lanai_pci_start(struct lanai_dev *lanai) static int lanai_pci_start(struct lanai_dev *lanai)
{ {
struct pci_dev *pci = lanai->pci; struct pci_dev *pci = lanai->pci;
int result; int result;
...@@ -2123,7 +2123,7 @@ static inline void lanai_cbr_shutdown(struct lanai_dev *lanai) ...@@ -2123,7 +2123,7 @@ static inline void lanai_cbr_shutdown(struct lanai_dev *lanai)
/* -------------------- OPERATIONS: */ /* -------------------- OPERATIONS: */
/* setup a newly detected device */ /* setup a newly detected device */
static int __devinit lanai_dev_open(struct atm_dev *atmdev) static int lanai_dev_open(struct atm_dev *atmdev)
{ {
struct lanai_dev *lanai = (struct lanai_dev *) atmdev->dev_data; struct lanai_dev *lanai = (struct lanai_dev *) atmdev->dev_data;
unsigned long raw_base; unsigned long raw_base;
...@@ -2566,7 +2566,7 @@ static const struct atmdev_ops ops = { ...@@ -2566,7 +2566,7 @@ static const struct atmdev_ops ops = {
}; };
/* initialize one probed card */ /* initialize one probed card */
static int __devinit lanai_init_one(struct pci_dev *pci, static int lanai_init_one(struct pci_dev *pci,
const struct pci_device_id *ident) const struct pci_device_id *ident)
{ {
struct lanai_dev *lanai; struct lanai_dev *lanai;
......
drivers/atm/nicstar.c
View file @ 6c44512d
...@@ -121,8 +121,8 @@ ...@@ -121,8 +121,8 @@
static u32 ns_read_sram(ns_dev * card, u32 sram_address); static u32 ns_read_sram(ns_dev * card, u32 sram_address);
static void ns_write_sram(ns_dev * card, u32 sram_address, u32 * value, static void ns_write_sram(ns_dev * card, u32 sram_address, u32 * value,
int count); int count);
static int __devinit ns_init_card(int i, struct pci_dev *pcidev); static int ns_init_card(int i, struct pci_dev *pcidev);
static void __devinit ns_init_card_error(ns_dev * card, int error); static void ns_init_card_error(ns_dev * card, int error);
static scq_info *get_scq(ns_dev *card, int size, u32 scd); static scq_info *get_scq(ns_dev *card, int size, u32 scd);
static void free_scq(ns_dev *card, scq_info * scq, struct atm_vcc *vcc); static void free_scq(ns_dev *card, scq_info * scq, struct atm_vcc *vcc);
static void push_rxbufs(ns_dev *, struct sk_buff *); static void push_rxbufs(ns_dev *, struct sk_buff *);
...@@ -180,7 +180,7 @@ MODULE_LICENSE("GPL"); ...@@ -180,7 +180,7 @@ MODULE_LICENSE("GPL");
/* Functions */ /* Functions */
static int __devinit nicstar_init_one(struct pci_dev *pcidev, static int nicstar_init_one(struct pci_dev *pcidev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
static int index = -1; static int index = -1;
...@@ -200,7 +200,7 @@ static int __devinit nicstar_init_one(struct pci_dev *pcidev, ...@@ -200,7 +200,7 @@ static int __devinit nicstar_init_one(struct pci_dev *pcidev,
return -ENODEV; return -ENODEV;
} }
static void __devexit nicstar_remove_one(struct pci_dev *pcidev) static void nicstar_remove_one(struct pci_dev *pcidev)
{ {
int i, j; int i, j;
ns_dev *card = pci_get_drvdata(pcidev); ns_dev *card = pci_get_drvdata(pcidev);
...@@ -262,7 +262,7 @@ static void __devexit nicstar_remove_one(struct pci_dev *pcidev) ...@@ -262,7 +262,7 @@ static void __devexit nicstar_remove_one(struct pci_dev *pcidev)
kfree(card); kfree(card);
} }
static struct pci_device_id nicstar_pci_tbl[] __devinitdata = { static struct pci_device_id nicstar_pci_tbl[] = {
{ PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77201), 0 }, { PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77201), 0 },
{0,} /* terminate list */ {0,} /* terminate list */
}; };
...@@ -273,7 +273,7 @@ static struct pci_driver nicstar_driver = { ...@@ -273,7 +273,7 @@ static struct pci_driver nicstar_driver = {
.name = "nicstar", .name = "nicstar",
.id_table = nicstar_pci_tbl, .id_table = nicstar_pci_tbl,
.probe = nicstar_init_one, .probe = nicstar_init_one,
.remove = __devexit_p(nicstar_remove_one), .remove = nicstar_remove_one,
}; };
static int __init nicstar_init(void) static int __init nicstar_init(void)
...@@ -351,7 +351,7 @@ static void ns_write_sram(ns_dev * card, u32 sram_address, u32 * value, ...@@ -351,7 +351,7 @@ static void ns_write_sram(ns_dev * card, u32 sram_address, u32 * value,
spin_unlock_irqrestore(&card->res_lock, flags); spin_unlock_irqrestore(&card->res_lock, flags);
} }
static int __devinit ns_init_card(int i, struct pci_dev *pcidev) static int ns_init_card(int i, struct pci_dev *pcidev)
{ {
int j; int j;
struct ns_dev *card = NULL; struct ns_dev *card = NULL;
...@@ -821,7 +821,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) ...@@ -821,7 +821,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
return error; return error;
} }
static void __devinit ns_init_card_error(ns_dev * card, int error) static void ns_init_card_error(ns_dev *card, int error)
{ {
if (error >= 17) { if (error >= 17) {
writel(0x00000000, card->membase + CFG); writel(0x00000000, card->membase + CFG);
......
drivers/atm/solos-pci.c
View file @ 6c44512d
...@@ -1462,7 +1462,7 @@ static void fpga_remove(struct pci_dev *dev) ...@@ -1462,7 +1462,7 @@ static void fpga_remove(struct pci_dev *dev)
kfree(card); kfree(card);
} }
static struct pci_device_id fpga_pci_tbl[] __devinitdata = { static struct pci_device_id fpga_pci_tbl[] = {
{ 0x10ee, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0x10ee, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0, } { 0, }
}; };
......
drivers/atm/zatm.c
View file @ 6c44512d
...@@ -1094,7 +1094,7 @@ static irqreturn_t zatm_int(int irq,void *dev_id) ...@@ -1094,7 +1094,7 @@ static irqreturn_t zatm_int(int irq,void *dev_id)
/*----------------------------- (E)EPROM access -----------------------------*/ /*----------------------------- (E)EPROM access -----------------------------*/
static void __devinit eprom_set(struct zatm_dev *zatm_dev,unsigned long value, static void eprom_set(struct zatm_dev *zatm_dev, unsigned long value,
unsigned short cmd) unsigned short cmd)
{ {
int error; int error;
...@@ -1105,8 +1105,7 @@ static void __devinit eprom_set(struct zatm_dev *zatm_dev,unsigned long value, ...@@ -1105,8 +1105,7 @@ static void __devinit eprom_set(struct zatm_dev *zatm_dev,unsigned long value,
} }
static unsigned long __devinit eprom_get(struct zatm_dev *zatm_dev, static unsigned long eprom_get(struct zatm_dev *zatm_dev, unsigned short cmd)
unsigned short cmd)
{ {
unsigned int value; unsigned int value;
int error; int error;
...@@ -1118,8 +1117,8 @@ static unsigned long __devinit eprom_get(struct zatm_dev *zatm_dev, ...@@ -1118,8 +1117,8 @@ static unsigned long __devinit eprom_get(struct zatm_dev *zatm_dev,
} }
static void __devinit eprom_put_bits(struct zatm_dev *zatm_dev, static void eprom_put_bits(struct zatm_dev *zatm_dev, unsigned long data,
unsigned long data,int bits,unsigned short cmd) int bits, unsigned short cmd)
{ {
unsigned long value; unsigned long value;
int i; int i;
...@@ -1133,8 +1132,8 @@ static void __devinit eprom_put_bits(struct zatm_dev *zatm_dev, ...@@ -1133,8 +1132,8 @@ static void __devinit eprom_put_bits(struct zatm_dev *zatm_dev,
} }
static void __devinit eprom_get_byte(struct zatm_dev *zatm_dev, static void eprom_get_byte(struct zatm_dev *zatm_dev, unsigned char *byte,
unsigned char *byte,unsigned short cmd) unsigned short cmd)
{ {
int i; int i;
...@@ -1149,8 +1148,8 @@ static void __devinit eprom_get_byte(struct zatm_dev *zatm_dev, ...@@ -1149,8 +1148,8 @@ static void __devinit eprom_get_byte(struct zatm_dev *zatm_dev,
} }
static unsigned char __devinit eprom_try_esi(struct atm_dev *dev, static unsigned char eprom_try_esi(struct atm_dev *dev, unsigned short cmd,
unsigned short cmd,int offset,int swap) int offset, int swap)
{ {
unsigned char buf[ZEPROM_SIZE]; unsigned char buf[ZEPROM_SIZE];
struct zatm_dev *zatm_dev; struct zatm_dev *zatm_dev;
...@@ -1170,7 +1169,7 @@ static unsigned char __devinit eprom_try_esi(struct atm_dev *dev, ...@@ -1170,7 +1169,7 @@ static unsigned char __devinit eprom_try_esi(struct atm_dev *dev,
} }
static void __devinit eprom_get_esi(struct atm_dev *dev) static void eprom_get_esi(struct atm_dev *dev)
{ {
if (eprom_try_esi(dev,ZEPROM_V1_REG,ZEPROM_V1_ESI_OFF,1)) return; if (eprom_try_esi(dev,ZEPROM_V1_REG,ZEPROM_V1_ESI_OFF,1)) return;
(void) eprom_try_esi(dev,ZEPROM_V2_REG,ZEPROM_V2_ESI_OFF,0); (void) eprom_try_esi(dev,ZEPROM_V2_REG,ZEPROM_V2_ESI_OFF,0);
...@@ -1180,7 +1179,7 @@ static void __devinit eprom_get_esi(struct atm_dev *dev) ...@@ -1180,7 +1179,7 @@ static void __devinit eprom_get_esi(struct atm_dev *dev)
/*--------------------------------- entries ---------------------------------*/ /*--------------------------------- entries ---------------------------------*/
static int __devinit zatm_init(struct atm_dev *dev) static int zatm_init(struct atm_dev *dev)
{ {
struct zatm_dev *zatm_dev; struct zatm_dev *zatm_dev;
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
...@@ -1257,7 +1256,7 @@ static int __devinit zatm_init(struct atm_dev *dev) ...@@ -1257,7 +1256,7 @@ static int __devinit zatm_init(struct atm_dev *dev)
} }
static int __devinit zatm_start(struct atm_dev *dev) static int zatm_start(struct atm_dev *dev)
{ {
struct zatm_dev *zatm_dev = ZATM_DEV(dev); struct zatm_dev *zatm_dev = ZATM_DEV(dev);
struct pci_dev *pdev = zatm_dev->pci_dev; struct pci_dev *pdev = zatm_dev->pci_dev;
...@@ -1584,7 +1583,7 @@ static const struct atmdev_ops ops = { ...@@ -1584,7 +1583,7 @@ static const struct atmdev_ops ops = {
.change_qos = zatm_change_qos, .change_qos = zatm_change_qos,
}; };
static int __devinit zatm_init_one(struct pci_dev *pci_dev, static int zatm_init_one(struct pci_dev *pci_dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct atm_dev *dev; struct atm_dev *dev;
...@@ -1636,7 +1635,7 @@ static int __devinit zatm_init_one(struct pci_dev *pci_dev, ...@@ -1636,7 +1635,7 @@ static int __devinit zatm_init_one(struct pci_dev *pci_dev,
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static struct pci_device_id zatm_pci_tbl[] __devinitdata = { static struct pci_device_id zatm_pci_tbl[] = {
{ PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1221), ZATM_COPPER }, { PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1221), ZATM_COPPER },
{ PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1225), 0 }, { PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1225), 0 },
{ 0, } { 0, }
......
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