diff options
| author | Mark Hounschell <markh@compro.net> | 2014-03-04 09:33:46 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-06 14:10:58 -0800 |
| commit | 3eb141511bd5dec5d57803eec40eee3049386397 (patch) | |
| tree | d1c5f771df1e5f65397030f870b450f3ad0b24bd /drivers/staging/dgap | |
| parent | dc7fcc96d9ddd114f8d0c13bb9327ad941bce031 (diff) | |
| download | linux-stable-3eb141511bd5dec5d57803eec40eee3049386397.tar.gz linux-stable-3eb141511bd5dec5d57803eec40eee3049386397.tar.bz2 linux-stable-3eb141511bd5dec5d57803eec40eee3049386397.zip | |
staging: dgap: get rid of nasty DGAP_VERIFY_BOARD macro
This patch replaces the DGAP_VERIFY_BOARD macro with
the dgap_verify_board function because of checkpatch error.
Signed-off-by: Mark Hounschell <markh@compro.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgap')
| -rw-r--r-- | drivers/staging/dgap/dgap.c | 62 |
1 files changed, 43 insertions, 19 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index f432f73da393..7f8b497aa8d0 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -6077,15 +6077,19 @@ static void dgap_remove_driver_sysfiles(struct pci_driver *dgap_driver) driver_remove_file(driverfs, &driver_attr_state); } -#define DGAP_VERIFY_BOARD(p, bd) \ - if (!p) \ - return 0; \ - \ - bd = dev_get_drvdata(p); \ - if (!bd || bd->magic != DGAP_BOARD_MAGIC) \ - return 0; \ - if (bd->state != BOARD_READY) \ - return 0; \ +static struct board_t *dgap_verify_board(struct device *p) +{ + struct board_t *bd; + + if (!p) + return NULL; + + bd = dev_get_drvdata(p); + if (!bd || bd->magic != DGAP_BOARD_MAGIC || bd->state != BOARD_READY) + return NULL; + + return bd; +} static ssize_t dgap_ports_state_show(struct device *p, struct device_attribute *attr, char *buf) { @@ -6093,7 +6097,9 @@ static ssize_t dgap_ports_state_show(struct device *p, struct device_attribute * int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) { count += snprintf(buf + count, PAGE_SIZE - count, @@ -6110,7 +6116,9 @@ static ssize_t dgap_ports_baud_show(struct device *p, struct device_attribute *a int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) { count += snprintf(buf + count, PAGE_SIZE - count, @@ -6126,7 +6134,9 @@ static ssize_t dgap_ports_msignals_show(struct device *p, struct device_attribut int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) { if (bd->channels[i]->ch_open_count) @@ -6152,7 +6162,9 @@ static ssize_t dgap_ports_iflag_show(struct device *p, struct device_attribute * int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n", @@ -6167,7 +6179,9 @@ static ssize_t dgap_ports_cflag_show(struct device *p, struct device_attribute * int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n", @@ -6182,7 +6196,9 @@ static ssize_t dgap_ports_oflag_show(struct device *p, struct device_attribute * int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n", @@ -6197,7 +6213,9 @@ static ssize_t dgap_ports_lflag_show(struct device *p, struct device_attribute * int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n", @@ -6212,7 +6230,9 @@ static ssize_t dgap_ports_digi_flag_show(struct device *p, struct device_attribu int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n", @@ -6227,7 +6247,9 @@ static ssize_t dgap_ports_rxcount_show(struct device *p, struct device_attribute int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) count += snprintf(buf + count, PAGE_SIZE - count, "%d %ld\n", @@ -6242,7 +6264,9 @@ static ssize_t dgap_ports_txcount_show(struct device *p, struct device_attribute int count = 0; int i = 0; - DGAP_VERIFY_BOARD(p, bd); + bd = dgap_verify_board(p); + if (!bd) + return 0; for (i = 0; i < bd->nasync; i++) count += snprintf(buf + count, PAGE_SIZE - count, "%d %ld\n", |