Commit d7cabeed authored by Mark Brown's avatar Mark Brown Committed by Vinod Koul
Browse files

dmaengine: PL08x: Avoid collisions with get_signal() macro 



As pointed out by Arnd Bergmann there is a get_signal macro definied in
linux/signal.h which can conflict with the platform data callback
function of the same name leading to confusing errors from the compiler
(especially if signal.h manages to get pulled into the driver itself due
to header dependencies).  Avoid such errors by renaming get_signal and
put_signal in the platform data to get_xfer_signal and put_xfer_signal.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent e368b510

arch/arm/mach-lpc32xx/phy3250.c

+2 −2
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ static void pl08x_put_signal(const struct pl08x_channel_data *cd, int ch) 
static struct pl08x_platform_data pl08x_pd = {

	.slave_channels = &pl08x_slave_channels[0],

	.num_slave_channels = ARRAY_SIZE(pl08x_slave_channels),

	.get_signal = pl08x_get_signal,

	.put_signal = pl08x_put_signal,

	.get_xfer_signal = pl08x_get_signal,

	.put_xfer_signal = pl08x_put_signal,

	.lli_buses = PL08X_AHB1,

	.mem_buses = PL08X_AHB1,

};

arch/arm/mach-spear/spear3xx.c

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ struct pl08x_platform_data pl080_plat_data = { 
	},

	.lli_buses = PL08X_AHB1,

	.mem_buses = PL08X_AHB1,

	.get_signal = pl080_get_signal,

	.put_signal = pl080_put_signal,

	.get_xfer_signal = pl080_get_signal,

	.put_xfer_signal = pl080_put_signal,

};



/*

arch/arm/mach-spear/spear6xx.c

+2 −2
Original line number Diff line number Diff line
@@ -335,8 +335,8 @@ static struct pl08x_platform_data spear6xx_pl080_plat_data = { 
	},

	.lli_buses = PL08X_AHB1,

	.mem_buses = PL08X_AHB1,

	.get_signal = pl080_get_signal,

	.put_signal = pl080_put_signal,

	.get_xfer_signal = pl080_get_signal,

	.put_xfer_signal = pl080_put_signal,

	.slave_channels = spear600_dma_info,

	.num_slave_channels = ARRAY_SIZE(spear600_dma_info),

};

drivers/dma/amba-pl08x.c

+4 −4
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ static int pl08x_request_mux(struct pl08x_dma_chan *plchan) 
	const struct pl08x_platform_data *pd = plchan->host->pd;

	int ret;



	if (plchan->mux_use++ == 0 && pd->get_signal) {

		ret = pd->get_signal(plchan->cd);

	if (plchan->mux_use++ == 0 && pd->get_xfer_signal) {

		ret = pd->get_xfer_signal(plchan->cd);

		if (ret < 0) {

			plchan->mux_use = 0;

			return ret;
@@ -318,8 +318,8 @@ static void pl08x_release_mux(struct pl08x_dma_chan *plchan) 
	if (plchan->signal >= 0) {

		WARN_ON(plchan->mux_use == 0);



		if (--plchan->mux_use == 0 && pd->put_signal) {

			pd->put_signal(plchan->cd, plchan->signal);

		if (--plchan->mux_use == 0 && pd->put_xfer_signal) {

			pd->put_xfer_signal(plchan->cd, plchan->signal);

			plchan->signal = -1;

		}

	}

include/linux/amba/pl08x.h

+4 −4
Original line number Diff line number Diff line
@@ -76,11 +76,11 @@ struct pl08x_channel_data { 
 * platform, all inclusive, including multiplexed channels. The available

 * physical channels will be multiplexed around these signals as they are

 * requested, just enumerate all possible channels.

 * @get_signal: request a physical signal to be used for a DMA transfer

 * @get_xfer_signal: request a physical signal to be used for a DMA transfer

 * immediately: if there is some multiplexing or similar blocking the use

 * of the channel the transfer can be denied by returning less than zero,

 * else it returns the allocated signal number

 * @put_signal: indicate to the platform that this physical signal is not

 * @put_xfer_signal: indicate to the platform that this physical signal is not

 * running any DMA transfer and multiplexing can be recycled

 * @lli_buses: buses which LLIs can be fetched from: PL08X_AHB1 | PL08X_AHB2

 * @mem_buses: buses which memory can be accessed from: PL08X_AHB1 | PL08X_AHB2
@@ -89,8 +89,8 @@ struct pl08x_platform_data { 
	const struct pl08x_channel_data *slave_channels;

	unsigned int num_slave_channels;

	struct pl08x_channel_data memcpy_channel;

	int (*get_signal)(const struct pl08x_channel_data *);

	void (*put_signal)(const struct pl08x_channel_data *, int);

	int (*get_xfer_signal)(const struct pl08x_channel_data *);

	void (*put_xfer_signal)(const struct pl08x_channel_data *, int);

	u8 lli_buses;

	u8 mem_buses;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE