Commit 228abb1d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-for-6.8-rc1-2' of... 

Merge tag 'fpga-for-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga

 into char-misc-next

Xu writes:

FPGA Manager changes for 6.8-rc1 second part

Not sure if it's too late for 6.8 rc1, but I try to speed up this
intermediate change.

- Uwe's change convert to new platform remove callback.

All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our for-next branch).

Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: zynq-fpga: Convert to platform remove callback returning void
  fpga: xilinx-pr-decoupler: Convert to platform remove callback returning void
  fpga: stratix10-soc: Convert to platform remove callback returning void
  fpga: socfpga-a10: Convert to platform remove callback returning void
  fpga: of-fpga-region: Convert to platform remove callback returning void
  fpga: intel-m10-bmc-sec-update: Convert to platform remove callback returning void
  fpga: dfl-fme-region: Convert to platform remove callback returning void
  fpga: dfl-fme-main: Convert to platform remove callback returning void
  fpga: dfl-fme-br: Convert to platform remove callback returning void
  fpga: dfl-afu-main: Convert to platform remove callback returning void
  fpga: altera-hps2fpga: Convert to platform remove callback returning void
  fpga: altera-freeze-bridge: Convert to platform remove callback returning void
  fpga: altera-fpga2sdram: Convert to platform remove callback returning void
parents b2231e48 c849ecb2

drivers/fpga/altera-fpga2sdram.c

+2 −4
Original line number Diff line number Diff line
@@ -147,20 +147,18 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev) 
	return ret;

}



static int alt_fpga_bridge_remove(struct platform_device *pdev)

static void alt_fpga_bridge_remove(struct platform_device *pdev)

{

	struct fpga_bridge *br = platform_get_drvdata(pdev);



	fpga_bridge_unregister(br);



	return 0;

}



MODULE_DEVICE_TABLE(of, altera_fpga_of_match);



static struct platform_driver altera_fpga_driver = {

	.probe = alt_fpga_bridge_probe,

	.remove = alt_fpga_bridge_remove,

	.remove_new = alt_fpga_bridge_remove,

	.driver = {

		.name	= "altera_fpga2sdram_bridge",

		.of_match_table = of_match_ptr(altera_fpga_of_match),

drivers/fpga/altera-freeze-bridge.c

+2 −4
Original line number Diff line number Diff line
@@ -253,18 +253,16 @@ static int altera_freeze_br_probe(struct platform_device *pdev) 
	return 0;

}



static int altera_freeze_br_remove(struct platform_device *pdev)

static void altera_freeze_br_remove(struct platform_device *pdev)

{

	struct fpga_bridge *br = platform_get_drvdata(pdev);



	fpga_bridge_unregister(br);



	return 0;

}



static struct platform_driver altera_freeze_br_driver = {

	.probe = altera_freeze_br_probe,

	.remove = altera_freeze_br_remove,

	.remove_new = altera_freeze_br_remove,

	.driver = {

		.name	= "altera_freeze_br",

		.of_match_table = altera_freeze_br_of_match,

drivers/fpga/altera-hps2fpga.c

+2 −4
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev) 
	return ret;

}



static int alt_fpga_bridge_remove(struct platform_device *pdev)

static void alt_fpga_bridge_remove(struct platform_device *pdev)

{

	struct fpga_bridge *bridge = platform_get_drvdata(pdev);

	struct altera_hps2fpga_data *priv = bridge->priv;
@@ -199,15 +199,13 @@ static int alt_fpga_bridge_remove(struct platform_device *pdev) 
	fpga_bridge_unregister(bridge);



	clk_disable_unprepare(priv->clk);



	return 0;

}



MODULE_DEVICE_TABLE(of, altera_fpga_of_match);



static struct platform_driver alt_fpga_bridge_driver = {

	.probe = alt_fpga_bridge_probe,

	.remove = alt_fpga_bridge_remove,

	.remove_new = alt_fpga_bridge_remove,

	.driver = {

		.name	= "altera_hps2fpga_bridge",

		.of_match_table = of_match_ptr(altera_fpga_of_match),

drivers/fpga/dfl-afu-main.c

+2 −4
Original line number Diff line number Diff line
@@ -932,15 +932,13 @@ static int afu_probe(struct platform_device *pdev) 
	return ret;

}



static int afu_remove(struct platform_device *pdev)

static void afu_remove(struct platform_device *pdev)

{

	dev_dbg(&pdev->dev, "%s\n", __func__);



	dfl_fpga_dev_ops_unregister(pdev);

	dfl_fpga_dev_feature_uinit(pdev);

	afu_dev_destroy(pdev);



	return 0;

}



static const struct attribute_group *afu_dev_groups[] = {
@@ -956,7 +954,7 @@ static struct platform_driver afu_driver = { 
		.dev_groups = afu_dev_groups,

	},

	.probe   = afu_probe,

	.remove  = afu_remove,

	.remove_new = afu_remove,

};



static int __init afu_init(void)

drivers/fpga/dfl-fme-br.c

+2 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int fme_br_probe(struct platform_device *pdev) 
	return 0;

}



static int fme_br_remove(struct platform_device *pdev)

static void fme_br_remove(struct platform_device *pdev)

{

	struct fpga_bridge *br = platform_get_drvdata(pdev);

	struct fme_br_priv *priv = br->priv;
@@ -89,8 +89,6 @@ static int fme_br_remove(struct platform_device *pdev) 
		put_device(&priv->port_pdev->dev);

	if (priv->port_ops)

		dfl_fpga_port_ops_put(priv->port_ops);



	return 0;

}



static struct platform_driver fme_br_driver = {
@@ -98,7 +96,7 @@ static struct platform_driver fme_br_driver = { 
		.name    = DFL_FPGA_FME_BRIDGE,

	},

	.probe   = fme_br_probe,

	.remove  = fme_br_remove,

	.remove_new = fme_br_remove,

};



module_platform_driver(fme_br_driver);