Skip to content

Commit

Permalink
PCI: qcom: Remove redundant struct qcom_pcie.dev
Browse files Browse the repository at this point in the history
Remove the struct qcom_pcie.dev member, which is a duplicate of the generic
pp.dev member.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Bjorn Helgaas committed Oct 12, 2016
1 parent 0edd578 commit e6a087e
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/pci/host/pcie-qcom.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ struct qcom_pcie_ops {

struct qcom_pcie {
struct pcie_port pp;
struct device *dev;
union qcom_pcie_resources res;
void __iomem *parf;
void __iomem *elbi;
Expand Down Expand Up @@ -135,7 +134,7 @@ static int qcom_pcie_establish_link(struct qcom_pcie *pcie)
static int qcom_pcie_get_resources_v0(struct qcom_pcie *pcie)
{
struct qcom_pcie_resources_v0 *res = &pcie->res.v0;
struct device *dev = pcie->dev;
struct device *dev = pcie->pp.dev;

res->vdda = devm_regulator_get(dev, "vdda");
if (IS_ERR(res->vdda))
Expand Down Expand Up @@ -187,7 +186,7 @@ static int qcom_pcie_get_resources_v0(struct qcom_pcie *pcie)
static int qcom_pcie_get_resources_v1(struct qcom_pcie *pcie)
{
struct qcom_pcie_resources_v1 *res = &pcie->res.v1;
struct device *dev = pcie->dev;
struct device *dev = pcie->pp.dev;

res->vdda = devm_regulator_get(dev, "vdda");
if (IS_ERR(res->vdda))
Expand Down Expand Up @@ -236,7 +235,7 @@ static void qcom_pcie_deinit_v0(struct qcom_pcie *pcie)
static int qcom_pcie_init_v0(struct qcom_pcie *pcie)
{
struct qcom_pcie_resources_v0 *res = &pcie->res.v0;
struct device *dev = pcie->dev;
struct device *dev = pcie->pp.dev;
u32 val;
int ret;

Expand Down Expand Up @@ -358,7 +357,7 @@ static void qcom_pcie_deinit_v1(struct qcom_pcie *pcie)
static int qcom_pcie_init_v1(struct qcom_pcie *pcie)
{
struct qcom_pcie_resources_v1 *res = &pcie->res.v1;
struct device *dev = pcie->dev;
struct device *dev = pcie->pp.dev;
int ret;

ret = reset_control_deassert(res->core);
Expand Down Expand Up @@ -510,7 +509,6 @@ static int qcom_pcie_probe(struct platform_device *pdev)

pp = &pcie->pp;
pcie->ops = (struct qcom_pcie_ops *)of_device_get_match_data(dev);
pcie->dev = dev;

pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_LOW);
if (IS_ERR(pcie->reset))
Expand Down

0 comments on commit e6a087e

Please sign in to comment.