diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2010-07-13 08:33:00 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2010-07-13 08:33:00 +0000 |
| commit | 5b506aee19dd5e0e7cbfb10451c05ebf2bcb9739 (patch) | |
| tree | 06c09ba708961c0b5d4c9796678ce79e21536c77 /drivers/dahdi/xpp/card_bri.c | |
| parent | 352a000d4f9ec3944bf23e0dda56466a10ad595e (diff) | |
Fix building without CONFIG_PROC_FS defined
This changeset should have no functional changes.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8877 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/card_bri.c')
| -rw-r--r-- | drivers/dahdi/xpp/card_bri.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index 15a1553..75a8940 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -56,6 +56,7 @@ enum xhfc_states { ST_NT_DEACTIVTING = 4, /* G4 */ }; +#ifdef CONFIG_PROC_FS static const char *xhfc_state_name(bool is_nt, enum xhfc_states state) { const char *p; @@ -92,6 +93,7 @@ static const char *xhfc_state_name(bool is_nt, enum xhfc_states state) } return p; } +#endif /* xhfc Layer1 physical commands */ #define HFC_L1_ACTIVATE_TE 0x01 @@ -157,7 +159,9 @@ typedef union { static int write_state_register(xpd_t *xpd, byte value); static bool bri_packet_is_valid(xpacket_t *pack); static void bri_packet_dump(const char *msg, xpacket_t *pack); +#ifdef CONFIG_PROC_FS static int proc_bri_info_read(char *page, char **start, off_t off, int count, int *eof, void *data); +#endif static int bri_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc); static int bri_chanconfig(struct dahdi_chan *chan, int sigtype); static int bri_startup(struct dahdi_span *span); @@ -799,14 +803,12 @@ static int bri_proc_create(xbus_t *xbus, xpd_t *xpd) priv->bri_info = create_proc_read_entry(PROC_BRI_INFO_FNAME, 0444, xpd->proc_xpd_dir, proc_bri_info_read, xpd); if(!priv->bri_info) { XPD_ERR(xpd, "Failed to create proc file '%s'\n", PROC_BRI_INFO_FNAME); - goto err; + bri_proc_remove(xbus, xpd); + return -EINVAL; } SET_PROC_DIRENTRY_OWNER(priv->bri_info); #endif return 0; -err: - bri_proc_remove(xbus, xpd); - return -EINVAL; } static xpd_t *BRI_card_new(xbus_t *xbus, int unit, int subunit, const xproto_table_t *proto_table, @@ -1694,6 +1696,7 @@ static void bri_packet_dump(const char *msg, xpacket_t *pack) } /*------------------------- REGISTER Handling --------------------------*/ +#ifdef CONFIG_PROC_FS static int proc_bri_info_read(char *page, char **start, off_t off, int count, int *eof, void *data) { int len = 0; @@ -1756,6 +1759,7 @@ static int proc_bri_info_read(char *page, char **start, off_t off, int count, in len = 0; return len; } +#endif static DRIVER_ATTR_READER(dchan_hardhdlc_show, drv,buf) { |