Commit ee705b46 authored by Adam Belay's avatar Adam Belay

[PNP] Remove protocol_data from pnp_dev and pnp_card

This is not needed.
parent 57a29937
...@@ -133,7 +133,6 @@ struct pnp_card { ...@@ -133,7 +133,6 @@ struct pnp_card {
struct pnp_protocol * protocol; struct pnp_protocol * protocol;
struct pnp_id * id; /* contains supported EISA IDs*/ struct pnp_id * id; /* contains supported EISA IDs*/
void * protocol_data; /* Used to store protocol specific data */
unsigned char pnpver; /* Plug & Play version */ unsigned char pnpver; /* Plug & Play version */
unsigned char productver; /* product version */ unsigned char productver; /* product version */
unsigned int serial; /* serial number */ unsigned int serial; /* serial number */
...@@ -149,16 +148,6 @@ struct pnp_card { ...@@ -149,16 +148,6 @@ struct pnp_card {
(card) != global_to_pnp_card(&pnp_cards); \ (card) != global_to_pnp_card(&pnp_cards); \
(card) = global_to_pnp_card((card)->global_list.next)) (card) = global_to_pnp_card((card)->global_list.next))
static inline void *pnp_get_card_protodata (struct pnp_card *pcard)
{
return pcard->protocol_data;
}
static inline void pnp_set_card_protodata (struct pnp_card *pcard, void *data)
{
pcard->protocol_data = data;
}
struct pnp_card_link { struct pnp_card_link {
struct pnp_card * card; struct pnp_card * card;
struct pnp_card_driver * driver; struct pnp_card_driver * driver;
...@@ -198,7 +187,6 @@ struct pnp_dev { ...@@ -198,7 +187,6 @@ struct pnp_dev {
struct pnp_option * dependent; struct pnp_option * dependent;
struct pnp_resource_table res; struct pnp_resource_table res;
void * protocol_data; /* Used to store protocol specific data */
unsigned short regs; /* ISAPnP: supported registers */ unsigned short regs; /* ISAPnP: supported registers */
int flags; /* used by protocols */ int flags; /* used by protocols */
struct proc_dir_entry *procent; /* device entry in /proc/bus/isapnp */ struct proc_dir_entry *procent; /* device entry in /proc/bus/isapnp */
...@@ -228,16 +216,6 @@ static inline void pnp_set_drvdata (struct pnp_dev *pdev, void *data) ...@@ -228,16 +216,6 @@ static inline void pnp_set_drvdata (struct pnp_dev *pdev, void *data)
dev_set_drvdata(&pdev->dev, data); dev_set_drvdata(&pdev->dev, data);
} }
static inline void *pnp_get_protodata (struct pnp_dev *pdev)
{
return pdev->protocol_data;
}
static inline void pnp_set_protodata (struct pnp_dev *pdev, void *data)
{
pdev->protocol_data = data;
}
struct pnp_fixup { struct pnp_fixup {
char id[7]; char id[7];
void (*quirk_function)(struct pnp_dev *dev); /* fixup function */ void (*quirk_function)(struct pnp_dev *dev); /* fixup function */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment