You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[PATCH] Create vio_bus_ops
Create vio_bus_ops so that we just pass a structure to vio_bus_init instead of three separate function pointers. Rearrange vio.h to avoid forward references. vio.h only needs struct device_node from prom.h so remove the include and just declare it. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
committed by
Paul Mackerras
parent
b877b90f22
commit
71d276d751
+48
-49
@@ -19,13 +19,14 @@
|
||||
#include <linux/errno.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
#include <asm/hvcall.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/scatterlist.h>
|
||||
/*
|
||||
|
||||
/*
|
||||
* Architecture-specific constants for drivers to
|
||||
* extract attributes of the device using vio_get_attribute()
|
||||
*/
|
||||
*/
|
||||
#define VETH_MAC_ADDR "local-mac-address"
|
||||
#define VETH_MCAST_FILTER_SIZE "ibm,mac-address-filters"
|
||||
|
||||
@@ -37,30 +38,19 @@
|
||||
#define VIO_IRQ_DISABLE 0UL
|
||||
#define VIO_IRQ_ENABLE 1UL
|
||||
|
||||
struct vio_dev;
|
||||
struct vio_driver;
|
||||
struct vio_device_id;
|
||||
struct iommu_table;
|
||||
|
||||
int vio_register_driver(struct vio_driver *drv);
|
||||
void vio_unregister_driver(struct vio_driver *drv);
|
||||
|
||||
#ifdef CONFIG_PPC_PSERIES
|
||||
struct vio_dev * __devinit vio_register_device_node(
|
||||
struct device_node *node_vdev);
|
||||
#endif
|
||||
void __devinit vio_unregister_device(struct vio_dev *dev);
|
||||
struct vio_dev *vio_find_node(struct device_node *vnode);
|
||||
|
||||
const void * vio_get_attribute(struct vio_dev *vdev, void* which, int* length);
|
||||
int vio_get_irq(struct vio_dev *dev);
|
||||
int vio_enable_interrupts(struct vio_dev *dev);
|
||||
int vio_disable_interrupts(struct vio_dev *dev);
|
||||
extern struct vio_dev * __devinit vio_register_device(struct vio_dev *viodev);
|
||||
|
||||
extern struct dma_mapping_ops vio_dma_ops;
|
||||
|
||||
extern struct bus_type vio_bus_type;
|
||||
/*
|
||||
* The vio_dev structure is used to describe virtual I/O devices.
|
||||
*/
|
||||
struct vio_dev {
|
||||
struct iommu_table *iommu_table; /* vio_map_* uses this */
|
||||
char *name;
|
||||
char *type;
|
||||
uint32_t unit_address;
|
||||
unsigned int irq;
|
||||
struct device dev;
|
||||
};
|
||||
|
||||
struct vio_device_id {
|
||||
char *type;
|
||||
@@ -70,42 +60,51 @@ struct vio_device_id {
|
||||
struct vio_driver {
|
||||
struct list_head node;
|
||||
char *name;
|
||||
const struct vio_device_id *id_table; /* NULL if wants all devices */
|
||||
int (*probe) (struct vio_dev *dev, const struct vio_device_id *id); /* New device inserted */
|
||||
int (*remove) (struct vio_dev *dev); /* Device removed (NULL if not a hot-plug capable driver) */
|
||||
const struct vio_device_id *id_table;
|
||||
int (*probe)(struct vio_dev *dev, const struct vio_device_id *id);
|
||||
int (*remove)(struct vio_dev *dev);
|
||||
unsigned long driver_data;
|
||||
|
||||
struct device_driver driver;
|
||||
};
|
||||
|
||||
struct vio_bus_ops {
|
||||
int (*match)(const struct vio_device_id *id, const struct vio_dev *dev);
|
||||
void (*unregister_device)(struct vio_dev *);
|
||||
void (*release_device)(struct device *);
|
||||
};
|
||||
|
||||
extern struct dma_mapping_ops vio_dma_ops;
|
||||
extern struct bus_type vio_bus_type;
|
||||
extern struct vio_dev vio_bus_device;
|
||||
|
||||
extern int vio_register_driver(struct vio_driver *drv);
|
||||
extern void vio_unregister_driver(struct vio_driver *drv);
|
||||
|
||||
extern struct vio_dev * __devinit vio_register_device(struct vio_dev *viodev);
|
||||
extern void __devinit vio_unregister_device(struct vio_dev *dev);
|
||||
|
||||
extern int vio_bus_init(struct vio_bus_ops *);
|
||||
|
||||
#ifdef CONFIG_PPC_PSERIES
|
||||
struct device_node;
|
||||
|
||||
extern struct vio_dev * __devinit vio_register_device_node(
|
||||
struct device_node *node_vdev);
|
||||
extern struct vio_dev *vio_find_node(struct device_node *vnode);
|
||||
extern const void *vio_get_attribute(struct vio_dev *vdev, void *which,
|
||||
int *length);
|
||||
extern int vio_enable_interrupts(struct vio_dev *dev);
|
||||
extern int vio_disable_interrupts(struct vio_dev *dev);
|
||||
#endif
|
||||
|
||||
static inline struct vio_driver *to_vio_driver(struct device_driver *drv)
|
||||
{
|
||||
return container_of(drv, struct vio_driver, driver);
|
||||
}
|
||||
|
||||
/*
|
||||
* The vio_dev structure is used to describe virtual I/O devices.
|
||||
*/
|
||||
struct vio_dev {
|
||||
struct iommu_table *iommu_table; /* vio_map_* uses this */
|
||||
char *name;
|
||||
char *type;
|
||||
uint32_t unit_address;
|
||||
unsigned int irq;
|
||||
|
||||
struct device dev;
|
||||
};
|
||||
|
||||
extern struct vio_dev vio_bus_device;
|
||||
|
||||
static inline struct vio_dev *to_vio_dev(struct device *dev)
|
||||
{
|
||||
return container_of(dev, struct vio_dev, dev);
|
||||
}
|
||||
|
||||
extern int vio_bus_init(int (*is_match)(const struct vio_device_id *id,
|
||||
const struct vio_dev *dev),
|
||||
void (*)(struct vio_dev *),
|
||||
void (*)(struct device *));
|
||||
|
||||
#endif /* _ASM_VIO_H */
|
||||
|
||||
Reference in New Issue
Block a user