Commit 6cefe675 authored by Todd Poynor's avatar Todd Poynor Committed by Greg Kroah-Hartman

staging: gasket: save struct device for a gasket device

Save the struct device pointer to a gasket device in gasket's metadata,
to facilitate use of standard logging calls and in anticipation of
non-PCI gasket devices in the future.
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3ceefa3f
...@@ -450,6 +450,7 @@ static int gasket_alloc_dev( ...@@ -450,6 +450,7 @@ static int gasket_alloc_dev(
gasket_dev->internal_desc = internal_desc; gasket_dev->internal_desc = internal_desc;
gasket_dev->dev_idx = dev_idx; gasket_dev->dev_idx = dev_idx;
snprintf(gasket_dev->kobj_name, GASKET_NAME_MAX, "%s", kobj_name); snprintf(gasket_dev->kobj_name, GASKET_NAME_MAX, "%s", kobj_name);
gasket_dev->dev = parent;
/* gasket_bar_data is uninitialized. */ /* gasket_bar_data is uninitialized. */
gasket_dev->num_page_tables = driver_desc->num_page_tables; gasket_dev->num_page_tables = driver_desc->num_page_tables;
/* max_page_table_size and *page table are uninit'ed */ /* max_page_table_size and *page table are uninit'ed */
...@@ -925,7 +926,7 @@ static int gasket_enable_dev( ...@@ -925,7 +926,7 @@ static int gasket_enable_dev(
&gasket_dev->bar_data[ &gasket_dev->bar_data[
driver_desc->page_table_bar_index], driver_desc->page_table_bar_index],
&driver_desc->page_table_configs[tbl_idx], &driver_desc->page_table_configs[tbl_idx],
&gasket_dev->pci_dev->dev, gasket_dev->pci_dev, true); gasket_dev->dev, gasket_dev->pci_dev, true);
if (ret) { if (ret) {
gasket_log_error( gasket_log_error(
gasket_dev, gasket_dev,
...@@ -2028,7 +2029,7 @@ const struct gasket_driver_desc *gasket_get_driver_desc(struct gasket_dev *dev) ...@@ -2028,7 +2029,7 @@ const struct gasket_driver_desc *gasket_get_driver_desc(struct gasket_dev *dev)
*/ */
struct device *gasket_get_device(struct gasket_dev *dev) struct device *gasket_get_device(struct gasket_dev *dev)
{ {
return &dev->pci_dev->dev; return dev->dev;
} }
/** /**
......
...@@ -263,6 +263,9 @@ struct gasket_dev { ...@@ -263,6 +263,9 @@ struct gasket_dev {
/* Pointer to the internal driver description for this device. */ /* Pointer to the internal driver description for this device. */
struct gasket_internal_desc *internal_desc; struct gasket_internal_desc *internal_desc;
/* Device info */
struct device *dev;
/* PCI subsystem metadata. */ /* PCI subsystem metadata. */
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
......
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