Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 17:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

Browse Source
This commit is contained in:
Stephen Rothwell 2024-12-20 09:41:42 +11:00
commit 6f20da0135
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spi/spi-rockchip-sfc.c
View File

@ -182,6 +182,7 @@ struct rockchip_sfc {
bool use_dma; bool use_dma;
u32 max_iosize; u32 max_iosize;
u16 version; u16 version;
struct spi_controller *host;
}; };
static int rockchip_sfc_reset(struct rockchip_sfc *sfc) static int rockchip_sfc_reset(struct rockchip_sfc *sfc)
@ -574,6 +575,7 @@ static int rockchip_sfc_probe(struct platform_device *pdev)
sfc = spi_controller_get_devdata(host); sfc = spi_controller_get_devdata(host);
sfc->dev = dev; sfc->dev = dev;
sfc->host = host;
sfc->regbase = devm_platform_ioremap_resource(pdev, 0); sfc->regbase = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(sfc->regbase)) if (IS_ERR(sfc->regbase))
@ -651,8 +653,8 @@ static int rockchip_sfc_probe(struct platform_device *pdev)
static void rockchip_sfc_remove(struct platform_device *pdev) static void rockchip_sfc_remove(struct platform_device *pdev)
{ {
struct spi_controller *host = platform_get_drvdata(pdev);
struct rockchip_sfc *sfc = platform_get_drvdata(pdev); struct rockchip_sfc *sfc = platform_get_drvdata(pdev);
struct spi_controller *host = sfc->host;
spi_unregister_controller(host); spi_unregister_controller(host);