90f671301a
(I did not compile or test it, please let me know, or help fixing it, if something is wrong with the conversion) This patch is part of a larger patch series which will remove the "char bus_id[20]" name string from struct device. The device name is managed in the kobject anyway, and without any size limitation, and just needlessly copied into "struct device". To set and read the device name dev_name(dev) and dev_set_name(dev) must be used. If your code uses static kobjects, which it shouldn't do, "const char *init_name" can be used to statically provide the name the registered device should have. At registration time, the init_name field is cleared, to enforce the use of dev_name(dev) to access the device name at a later time. We need to get rid of all occurrences of bus_id in the entire tree to be able to enable the new interface. Please apply this patch, and possibly convert any remaining remaining occurrences of bus_id. We want to submit a patch to -next, which will remove bus_id from "struct device", to find the remaining pieces to convert, and finally switch over to the new api, which will remove the 20 bytes array and does no longer have a size limitation. Thanks, Kay Cc: Matthew Wilcox <matthew@wil.cx> Cc: linux-parisc@vger.kernel.org Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
65 lines
1.8 KiB
C
65 lines
1.8 KiB
C
#ifndef _ASM_PARISC_PARISC_DEVICE_H_
|
|
#define _ASM_PARISC_PARISC_DEVICE_H_
|
|
|
|
#include <linux/device.h>
|
|
|
|
struct parisc_device {
|
|
struct resource hpa; /* Hard Physical Address */
|
|
struct parisc_device_id id;
|
|
struct parisc_driver *driver; /* Driver for this device */
|
|
char name[80]; /* The hardware description */
|
|
int irq;
|
|
int aux_irq; /* Some devices have a second IRQ */
|
|
|
|
char hw_path; /* The module number on this bus */
|
|
unsigned int num_addrs; /* some devices have additional address ranges. */
|
|
unsigned long *addr; /* which will be stored here */
|
|
|
|
#ifdef CONFIG_64BIT
|
|
/* parms for pdc_pat_cell_module() call */
|
|
unsigned long pcell_loc; /* Physical Cell location */
|
|
unsigned long mod_index; /* PAT specific - Misc Module info */
|
|
|
|
/* generic info returned from pdc_pat_cell_module() */
|
|
unsigned long mod_info; /* PAT specific - Misc Module info */
|
|
unsigned long pmod_loc; /* physical Module location */
|
|
#endif
|
|
u64 dma_mask; /* DMA mask for I/O */
|
|
struct device dev;
|
|
};
|
|
|
|
struct parisc_driver {
|
|
struct parisc_driver *next;
|
|
char *name;
|
|
const struct parisc_device_id *id_table;
|
|
int (*probe) (struct parisc_device *dev); /* New device discovered */
|
|
int (*remove) (struct parisc_device *dev);
|
|
struct device_driver drv;
|
|
};
|
|
|
|
|
|
#define to_parisc_device(d) container_of(d, struct parisc_device, dev)
|
|
#define to_parisc_driver(d) container_of(d, struct parisc_driver, drv)
|
|
#define parisc_parent(d) to_parisc_device(d->dev.parent)
|
|
|
|
static inline const char *parisc_pathname(struct parisc_device *d)
|
|
{
|
|
return dev_name(&d->dev);
|
|
}
|
|
|
|
static inline void
|
|
parisc_set_drvdata(struct parisc_device *d, void *p)
|
|
{
|
|
dev_set_drvdata(&d->dev, p);
|
|
}
|
|
|
|
static inline void *
|
|
parisc_get_drvdata(struct parisc_device *d)
|
|
{
|
|
return dev_get_drvdata(&d->dev);
|
|
}
|
|
|
|
extern struct bus_type parisc_bus_type;
|
|
|
|
#endif /*_ASM_PARISC_PARISC_DEVICE_H_*/
|