more gcc3.4 inline fixes [3/10]
PATCH 1/1 more gcc3.4 inline fixes [3/10]
drivers/ieee1394/eth1394.c renamed from drivers/ieee1394/eth1394.c~ +14 -15
@@ -149,6 +149,20 @@ "(default = 25).");static int max_partial_datagrams =25 ; +static inline void purge_partial_datagram (struct list_head *old) +{ + struct partial_datagram *pd = list_entry(old, struct partial_datagram, list); +struct list_head *lh, *n; + +list_for_each_safe (lh, n, &pd->frag_info) { + struct fragment_info *fi = list_entry(lh, struct fragment_info, list); +list_del (lh); +kfree (fi); + } +list_del (old); +kfree_skb (pd->skb); +kfree (pd); +} static int ether1394_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr,
@@ -885,21 +899,6 @@return 0 ; } -static inline void purge_partial_datagram (struct list_head *old) -{ - struct partial_datagram *pd = list_entry(old, struct partial_datagram, list); -struct list_head *lh, *n; - -list_for_each_safe (lh, n, &pd->frag_info) { - struct fragment_info *fi = list_entry(lh, struct fragment_info, list); -list_del (lh); -kfree (fi); - } -list_del (old); -kfree_skb (pd->skb); -kfree (pd); -} -static inline int is_datagram_complete (struct list_head *lh,int dg_size) { struct partial_datagram *pd = list_entry(lh, struct partial_datagram, list);
drivers/isdn/hisax/isar.c renamed from drivers/isdn/hisax/isar.c~ +15 -15
@@ -428,6 +428,21 @@return (ret); } +static inline void +ll_deliver_faxstat (struct BCState *bcs,u_char status) +{ +isdn_ctrl ic; +struct Channel *chanp = (struct Channel *) bcs->st->lli.userdata; + +if (bcs->cs->debug &L1_DEB_HSCX ) +debugl1 (bcs->cs,"HL->LL FAXIND %x" , status); + ic.driver = bcs->cs->myid; + ic.command =ISDN_STAT_FAXIND ; + ic.arg = chanp->chan; + ic.parm.aux.cmd = status; + bcs->cs->iif.statcallb (&ic); +} +extern void BChannel_bh (struct BCState *);#define B_LL_NOCARRIER 8#define B_LL_CONNECT 9
@@ -962,21 +977,6 @@ } } -static inline void -ll_deliver_faxstat (struct BCState *bcs,u_char status) -{ -isdn_ctrl ic; -struct Channel *chanp = (struct Channel *) bcs->st->lli.userdata; - -if (bcs->cs->debug &L1_DEB_HSCX ) -debugl1 (bcs->cs,"HL->LL FAXIND %x" , status); - ic.driver = bcs->cs->myid; - ic.command =ISDN_STAT_FAXIND ; - ic.arg = chanp->chan; - ic.parm.aux.cmd = status; - bcs->cs->iif.statcallb (&ic); -} -static void isar_pump_statev_fax (struct BCState *bcs,u_char devt) {struct IsdnCardState *cs = bcs->cs;