From ea8e710d161c71eb43697b94df40d073038696ba Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Thu, 16 Aug 2012 20:26:00 -0700 Subject: [PATCH] --- yaml --- r: 321863 b: refs/heads/master c: af36107968f1b5faab0e4a0cc44fa4498c63f017 h: refs/heads/master i: 321861: 7aa1a55f629c9a506eda4e02e945281c5ad4da4c 321859: 5a442047af9536460badcbd9d087a6b269bb7a43 321855: f16b8c1deb1c63c5241df0698213cc1dc6115e47 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-coldfire-qspi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18d631021a7d..b2a91353f31c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0c3652caa357b8f4e76efe401646ef298483cd9 +refs/heads/master: af36107968f1b5faab0e4a0cc44fa4498c63f017 diff --git a/trunk/drivers/spi/spi-coldfire-qspi.c b/trunk/drivers/spi/spi-coldfire-qspi.c index 1a30b47465cb..764bfee75920 100644 --- a/trunk/drivers/spi/spi-coldfire-qspi.c +++ b/trunk/drivers/spi/spi-coldfire-qspi.c @@ -540,7 +540,7 @@ static int __devexit mcfqspi_remove(struct platform_device *pdev) #ifdef CONFIG_PM_SLEEP static int mcfqspi_suspend(struct device *dev) { - struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); + struct spi_master *master = dev_get_drvdata(dev); struct mcfqspi *mcfqspi = spi_master_get_devdata(master); spi_master_suspend(master); @@ -552,7 +552,7 @@ static int mcfqspi_suspend(struct device *dev) static int mcfqspi_resume(struct device *dev) { - struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); + struct spi_master *master = dev_get_drvdata(dev); struct mcfqspi *mcfqspi = spi_master_get_devdata(master); spi_master_resume(master);