C Instrumentation Framework

I fixed the first part of the given issue in 841586c several months ago. The second part looks to be unrelated and more complicated.

#define container_of(ptr, type, member) ({                      \
        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
        (type *)( (char *)__mptr - offsetof(type,member) );})
#define to_usb_device(d) container_of(d, struct usb_device, dev)
static inline struct usb_device *interface_to_usbdev(struct usb_interface *intf)
{
  return to_usb_device(intf->dev.parent);
}

Should be:

__inline static struct usb_device *interface_to_usbdev(struct usb_interface *intf ) 
{ 
  struct device  const  *__mptr ;

  {
    __mptr = (struct device  const  *)intf->dev.parent;
    return ((struct usb_device *)( (char *)__mptr + 0xffffffffffffff70UL) );
  }
}

but CIF produce:

__inline static struct usb_device *interface_to_usbdev(struct usb_interface *intf ) 
{ 
  struct device  const  *__mptr ;

  {
    __mptr = (struct device  const  *)intf->dev.parent;
    return ((struct usb_device *)__mptr + 0xffffffffffffff70UL);
  }
}

I fixed this issue one more time in e5f3be7 since my previous fix was broken when merging with the GCC master branch.