Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 348196
b: refs/heads/master
c: 6c44512
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jan 3, 2013
1 parent f53b46d commit a8a8c42
Show file tree
Hide file tree
Showing 13 changed files with 153 additions and 176 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 082a2004db27e16ee9a5b1234e6ab219ea29d693
refs/heads/master: 6c44512d06d3f6afcead304f051f4a06ed9be2cd
53 changes: 30 additions & 23 deletions trunk/drivers/atm/ambassador.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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");
Expand All @@ -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");
Expand All @@ -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;

Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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,
};

Expand Down
18 changes: 9 additions & 9 deletions trunk/drivers/atm/eni.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -2226,8 +2226,8 @@ static const struct atmdev_ops ops = {
};


static int __devinit eni_init_one(struct pci_dev *pci_dev,
const struct pci_device_id *ent)
static int eni_init_one(struct pci_dev *pci_dev,
const struct pci_device_id *ent)
{
struct atm_dev *dev;
struct eni_dev *eni_dev;
Expand Down Expand Up @@ -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);
Expand All @@ -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,
};


Expand Down
32 changes: 16 additions & 16 deletions trunk/drivers/atm/firestream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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;

Expand All @@ -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;

Expand Down Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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 ();

Expand Down Expand Up @@ -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 ();

Expand All @@ -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 ();

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1897,8 +1897,8 @@ static int __devinit fs_init (struct fs_dev *dev)
return 1;
}

static int __devinit firestream_init_one (struct pci_dev *pci_dev,
const struct pci_device_id *ent)
static int firestream_init_one(struct pci_dev *pci_dev,
const struct pci_device_id *ent)
{
struct atm_dev *atm_dev;
struct fs_dev *fs_dev;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
Loading

0 comments on commit a8a8c42

Please sign in to comment.