staging: brcm80211: remove redundant bus register layer from fullmac (43e45c3e) · Commits · 戴 / test

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -362,16 +362,6 @@ int brcmf_sdio_remove(struct brcmf_sdio_dev *sdiodev)
		}
		EXPORT_SYMBOL(brcmf_sdio_remove);

		int brcmf_sdio_register(void)
		{
		return brcmf_sdio_function_init();
		}

		void brcmf_sdio_unregister(void)
		{
		brcmf_sdio_function_cleanup();
		}

		void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev, bool enable)
		{
		if (enable)

+4 −12

Original line number	Diff line number	Diff line
		@@ -609,23 +609,15 @@ static struct sdio_driver brcmf_sdmmc_driver = {
		#endif /* CONFIG_PM_SLEEP */
		};

		/*
		* module init
		*/
		int brcmf_sdio_function_init(void)
		/* bus register interface */
		int brcmf_bus_register(void)
		{
		int error = 0;
		brcmf_dbg(TRACE, "Enter\n");

		error = sdio_register_driver(&brcmf_sdmmc_driver);

		return error;
		return sdio_register_driver(&brcmf_sdmmc_driver);
		}

		/*
		* module cleanup
		*/
		void brcmf_sdio_function_cleanup(void)
		void brcmf_bus_unregister(void)
		{
		brcmf_dbg(TRACE, "Enter\n");

+0 −14

Original line number	Diff line number	Diff line
		@@ -4533,20 +4533,6 @@ void brcmf_sdbrcm_disconnect(void *ptr)
		brcmf_dbg(TRACE, "Disconnected\n");
		}

		int brcmf_bus_register(void)
		{
		brcmf_dbg(TRACE, "Enter\n");

		return brcmf_sdio_register();
		}

		void brcmf_bus_unregister(void)
		{
		brcmf_dbg(TRACE, "Enter\n");

		brcmf_sdio_unregister();
		}

		struct device brcmf_bus_get_device(struct brcmf_bus bus)
		{
		return &bus->sdiodev->func[2]->dev;

+0 −4

Original line number	Diff line number	Diff line
		@@ -211,10 +211,6 @@ extern int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw,
		extern int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn);

		/* platform specific/high level functions */
		extern int brcmf_sdio_function_init(void);
		extern int brcmf_sdio_register(void);
		extern void brcmf_sdio_unregister(void);
		extern void brcmf_sdio_function_cleanup(void);
		extern int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev);
		extern int brcmf_sdio_remove(struct brcmf_sdio_dev *sdiodev);