Skip to content

Commit

Permalink
mISDN: Fix wrong struct name in macro and clarifications
Browse files Browse the repository at this point in the history
Based on comments from Joe Perches <joe@perches.com>. Thanks.

Fix IOFUNC_MEMIO macro. WriteFiFo##name##_MIO use the wrong struct name,
this was missed because the macro was only called with this name.

Clarify with _func that the defined types are functions.
Add names to the parameters for better understanding the purpose.

Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Karsten Keil authored and David S. Miller committed Jul 27, 2009
1 parent 7003491 commit 663a31c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions drivers/isdn/hardware/mISDN/iohelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
#ifndef _IOHELPER_H
#define _IOHELPER_H

typedef u8 (read_reg_t)(void *, u8);
typedef void (write_reg_t)(void *, u8, u8);
typedef void (fifo_func_t)(void *, u8, u8 *, int);
typedef u8 (read_reg_func)(void *hwp, u8 offset);
typedef void (write_reg_func)(void *hwp, u8 offset, u8 value);
typedef void (fifo_func)(void *hwp, u8 offset, u8 *datap, int size);

struct _ioport {
u32 port;
Expand Down Expand Up @@ -90,7 +90,7 @@ struct _ioport {
*dp++ = readb(((typ *)hw->adr) + off);\
} \
static void WriteFiFo##name##_MIO(void *p, u8 off, u8 *dp, int size) {\
struct inf_hw *hw = p;\
struct hws *hw = p;\
while (size--)\
writeb(*dp++, ((typ *)hw->adr) + off);\
}
Expand All @@ -106,4 +106,4 @@ struct _ioport {
ASSIGN_FUNC(typ, IPAC, target);\
} while (0)

#endif
#endif
16 changes: 8 additions & 8 deletions drivers/isdn/hardware/mISDN/ipac.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ struct isac_hw {
u32 off; /* offset to isac regs */
char *name;
spinlock_t *hwlock; /* lock HW acccess */
read_reg_t *read_reg;
write_reg_t *write_reg;
fifo_func_t *read_fifo;
fifo_func_t *write_fifo;
read_reg_func *read_reg;
write_reg_func *write_reg;
fifo_func *read_fifo;
fifo_func *write_fifo;
int (*monitor)(void *, u32, u8 *, int);
void (*release)(struct isac_hw *);
int (*init)(struct isac_hw *);
Expand Down Expand Up @@ -73,10 +73,10 @@ struct ipac_hw {
spinlock_t *hwlock; /* lock HW acccess */
struct module *owner;
u32 type;
read_reg_t *read_reg;
write_reg_t *write_reg;
fifo_func_t *read_fifo;
fifo_func_t *write_fifo;
read_reg_func *read_reg;
write_reg_func *write_reg;
fifo_func *read_fifo;
fifo_func *write_fifo;
void (*release)(struct ipac_hw *);
int (*init)(struct ipac_hw *);
int (*ctrl)(struct ipac_hw *, u32, u_long);
Expand Down
8 changes: 4 additions & 4 deletions drivers/isdn/hardware/mISDN/isar.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ struct isar_hw {
spinlock_t *hwlock; /* lock HW acccess */
char *name;
struct module *owner;
read_reg_t *read_reg;
write_reg_t *write_reg;
fifo_func_t *read_fifo;
fifo_func_t *write_fifo;
read_reg_func *read_reg;
write_reg_func *write_reg;
fifo_func *read_fifo;
fifo_func *write_fifo;
int (*ctrl)(void *, u32, u_long);
void (*release)(struct isar_hw *);
int (*init)(struct isar_hw *);
Expand Down

0 comments on commit 663a31c

Please sign in to comment.