diff options
Diffstat (limited to 'sys/compat/linuxkpi/common/include')
17 files changed, 0 insertions, 22 deletions
diff --git a/sys/compat/linuxkpi/common/include/asm/atomic-long.h b/sys/compat/linuxkpi/common/include/asm/atomic-long.h index e2bea06c0953..c80c348f95f9 100644 --- a/sys/compat/linuxkpi/common/include/asm/atomic-long.h +++ b/sys/compat/linuxkpi/common/include/asm/atomic-long.h @@ -34,7 +34,6 @@ #include <linux/compiler.h> #include <sys/types.h> #include <machine/atomic.h> - #define ATOMIC_LONG_INIT(x) { .counter = (x) } typedef struct { diff --git a/sys/compat/linuxkpi/common/include/asm/atomic.h b/sys/compat/linuxkpi/common/include/asm/atomic.h index fff06f61d856..5cdfbe674ef3 100644 --- a/sys/compat/linuxkpi/common/include/asm/atomic.h +++ b/sys/compat/linuxkpi/common/include/asm/atomic.h @@ -35,7 +35,6 @@ #include <linux/compiler.h> #include <sys/types.h> #include <machine/atomic.h> - #define ATOMIC_INIT(x) { .counter = (x) } typedef struct { diff --git a/sys/compat/linuxkpi/common/include/asm/atomic64.h b/sys/compat/linuxkpi/common/include/asm/atomic64.h index c60117b5cb8c..b8b87bb2c685 100644 --- a/sys/compat/linuxkpi/common/include/asm/atomic64.h +++ b/sys/compat/linuxkpi/common/include/asm/atomic64.h @@ -35,7 +35,6 @@ typedef struct { volatile int64_t counter; } atomic64_t; - #define ATOMIC64_INIT(x) { .counter = (x) } /*------------------------------------------------------------------------* diff --git a/sys/compat/linuxkpi/common/include/linux/compat.h b/sys/compat/linuxkpi/common/include/linux/compat.h index e9b2e4dfd1a7..03b7dc60b7a1 100644 --- a/sys/compat/linuxkpi/common/include/linux/compat.h +++ b/sys/compat/linuxkpi/common/include/linux/compat.h @@ -41,7 +41,6 @@ struct task_struct; extern int linux_alloc_current(struct thread *, int flags); extern void linux_free_current(struct task_struct *); - static inline void linux_set_current(struct thread *td) { diff --git a/sys/compat/linuxkpi/common/include/linux/dma-attrs.h b/sys/compat/linuxkpi/common/include/linux/dma-attrs.h index 5cb75e06cd38..d424d16164a6 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-attrs.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-attrs.h @@ -45,7 +45,6 @@ struct dma_attrs { unsigned long flags; }; - #define DEFINE_DMA_ATTRS(x) struct dma_attrs x = { } static inline void diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 291bd4a8e7ce..d074b563cd41 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -276,7 +276,6 @@ static inline unsigned int dma_set_max_seg_size(struct device *dev, return (0); } - #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL) #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL) #define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL) diff --git a/sys/compat/linuxkpi/common/include/linux/dmapool.h b/sys/compat/linuxkpi/common/include/linux/dmapool.h index 80d74f153747..980d5d74884f 100644 --- a/sys/compat/linuxkpi/common/include/linux/dmapool.h +++ b/sys/compat/linuxkpi/common/include/linux/dmapool.h @@ -82,5 +82,4 @@ dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma_addr) linux_dma_pool_free(pool, vaddr, dma_addr); } - #endif /* _LINUX_DMAPOOL_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/fs.h b/sys/compat/linuxkpi/common/include/linux/fs.h index f400fc7cbfda..66a1607b99e2 100644 --- a/sys/compat/linuxkpi/common/include/linux/fs.h +++ b/sys/compat/linuxkpi/common/include/linux/fs.h @@ -64,7 +64,6 @@ struct linux_cdev; #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) - typedef struct files_struct *fl_owner_t; struct file_operations; diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index 754bc4303ded..0104eea90ace 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -43,7 +43,6 @@ * XXX This is all x86 specific. It should be bus space access. */ - /* rmb and wmb are declared in machine/atomic.h, so should be included first. */ #ifndef __io_br #define __io_br() __compiler_membar() diff --git a/sys/compat/linuxkpi/common/include/linux/jhash.h b/sys/compat/linuxkpi/common/include/linux/jhash.h index c3904e276778..08300083212f 100644 --- a/sys/compat/linuxkpi/common/include/linux/jhash.h +++ b/sys/compat/linuxkpi/common/include/linux/jhash.h @@ -116,7 +116,6 @@ static inline u32 jhash2(const u32 *k, u32 length, u32 initval) return c; } - /* A special ultra-optimized versions that knows they are hashing exactly * 3, 2 or 1 word(s). * diff --git a/sys/compat/linuxkpi/common/include/linux/kmod.h b/sys/compat/linuxkpi/common/include/linux/kmod.h index 3fd42fab584c..b8a1a8b677ed 100644 --- a/sys/compat/linuxkpi/common/include/linux/kmod.h +++ b/sys/compat/linuxkpi/common/include/linux/kmod.h @@ -48,5 +48,4 @@ #define request_module_nowait request_module - #endif /* _LINUX_KMOD_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/kref.h b/sys/compat/linuxkpi/common/include/linux/kref.h index cfc5c0231e23..d5b45ba59313 100644 --- a/sys/compat/linuxkpi/common/include/linux/kref.h +++ b/sys/compat/linuxkpi/common/include/linux/kref.h @@ -91,7 +91,6 @@ kref_put_lock(struct kref *kref, void (*rel)(struct kref *kref), return (0); } - static inline int kref_sub(struct kref *kref, unsigned int count, void (*rel)(struct kref *kref)) diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h index c16007eab143..8135aec85c22 100644 --- a/sys/compat/linuxkpi/common/include/linux/list.h +++ b/sys/compat/linuxkpi/common/include/linux/list.h @@ -73,7 +73,6 @@ #ifndef prefetch #define prefetch(x) #endif - #define LINUX_LIST_HEAD_INIT(name) { &(name), &(name) } #define LINUX_LIST_HEAD(name) \ @@ -324,7 +323,6 @@ list_splice_tail_init(struct list_head *list, struct list_head *head) #undef LIST_HEAD #define LIST_HEAD(name) struct list_head name = { &(name), &(name) } - struct hlist_head { struct hlist_node *first; }; @@ -332,7 +330,6 @@ struct hlist_head { struct hlist_node { struct hlist_node *next, **pprev; }; - #define HLIST_HEAD_INIT { } #define HLIST_HEAD(name) struct hlist_head name = HLIST_HEAD_INIT #define INIT_HLIST_HEAD(head) (head)->first = NULL diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 2c23f2a42a12..643bc7cc2630 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -496,7 +496,6 @@ static inline int pci_pcie_cap(struct pci_dev *dev) return pci_find_capability(dev, PCI_CAP_ID_EXP); } - static inline int pci_read_config_byte(struct pci_dev *pdev, int where, u8 *val) { @@ -706,7 +705,6 @@ pci_iounmap(struct pci_dev *dev, void *res) #define DEFINE_PCI_DEVICE_TABLE(_table) \ const struct pci_device_id _table[] __devinitdata - /* XXX This should not be necessary. */ #define pcix_set_mmrbc(d, v) 0 #define pcix_get_max_mmrbc(d) 0 @@ -773,7 +771,6 @@ enum pci_ers_result { PCI_ERS_RESULT_RECOVERED = 5, }; - /* PCI bus error event callbacks */ struct pci_error_handlers { pci_ers_result_t (*error_detected)(struct pci_dev *dev, @@ -809,7 +806,6 @@ static inline u16 pcie_flags_reg(struct pci_dev *dev) return reg16; } - static inline int pci_pcie_type(struct pci_dev *dev) { return (pcie_flags_reg(dev) & PCI_EXP_FLAGS_TYPE) >> 4; diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h index a23edfb0b4de..505c3009441c 100644 --- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h +++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h @@ -479,5 +479,4 @@ sg_page_iter_page(struct sg_page_iter *piter) return (nth_page(sg_page(piter->sg), piter->sg_pgoffset)); } - #endif /* _LINUX_SCATTERLIST_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/sysfs.h b/sys/compat/linuxkpi/common/include/linux/sysfs.h index 59e30f152f6e..c645d9fdf45a 100644 --- a/sys/compat/linuxkpi/common/include/linux/sysfs.h +++ b/sys/compat/linuxkpi/common/include/linux/sysfs.h @@ -57,7 +57,6 @@ struct attribute_group { #define __ATTR_RO(_name) __ATTR(_name, 0444, _name##_show, NULL) #define __ATTR_WO(_name) __ATTR(_name, 0200, NULL, _name##_store) #define __ATTR_RW(_name) __ATTR(_name, 0644, _name##_show, _name##_store) - #define __ATTR_NULL { .attr = { .name = NULL } } #define ATTRIBUTE_GROUPS(_name) \ diff --git a/sys/compat/linuxkpi/common/include/net/ipv6.h b/sys/compat/linuxkpi/common/include/net/ipv6.h index feabd7360280..3eb6051035af 100644 --- a/sys/compat/linuxkpi/common/include/net/ipv6.h +++ b/sys/compat/linuxkpi/common/include/net/ipv6.h @@ -110,5 +110,4 @@ static inline int ipv6_addr_cmp(const struct in6_addr *a1, const struct in6_addr return memcmp(a1, a2, sizeof(struct in6_addr)); } - #endif /* _LINUX_NET_IPV6_H_ */ |