Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbfca4b8 authored by Ben Nizette's avatar Ben Nizette Committed by Haavard Skinnemoen
Browse files

avr32: clean up mci platform code 



This patch does a few small cleanups around the atmel mci platform code
and in the atmel-mci driver.  The platform changes simply removes an
unused variable, uses the fact that by the end we always have some form
of platform data and notes that GPIO_PIN_NONE != 0.  This last point
could cause the incorrect attempt to twice reserve pin PA0.

While we've got the hood up, add linux/err.h to the atmel-mci.c include
list.  It needs it and generally pulls it by voodoo but I did once
stumble across a config which don't build.

This is against Linus' latest git.

Signed-off-by: default avatarBen Nizette <bn@niasdigital.com>
Signed-off-by: default avatarHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
parent 62fe8378

arch/avr32/mach-at32ap/at32ap700x.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -1284,7 +1284,6 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data) 
{

{

	struct mci_platform_data	_data;

	struct mci_platform_data	_data;

	struct platform_device		*pdev;

	struct platform_device		*pdev;

	struct dw_dma_slave		*dws;





	if (id != 0)

	if (id != 0)

		return NULL;

		return NULL;
@@ -1300,6 +1299,8 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data) 
	if (!data) {

	if (!data) {

		data = &_data;

		data = &_data;

		memset(data, 0, sizeof(struct mci_platform_data));

		memset(data, 0, sizeof(struct mci_platform_data));

		data->detect_pin = GPIO_PIN_NONE;

		data->wp_pin = GPIO_PIN_NONE;

	}

	}





	if (platform_device_add_data(pdev, data,

	if (platform_device_add_data(pdev, data,
@@ -1313,12 +1314,10 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data) 
	select_peripheral(PA(14), PERIPH_A, 0);	/* DATA2 */

	select_peripheral(PA(14), PERIPH_A, 0);	/* DATA2 */

	select_peripheral(PA(15), PERIPH_A, 0);	/* DATA3 */

	select_peripheral(PA(15), PERIPH_A, 0);	/* DATA3 */





	if (data) {

	if (data->detect_pin != GPIO_PIN_NONE)

	if (data->detect_pin != GPIO_PIN_NONE)

		at32_select_gpio(data->detect_pin, 0);

		at32_select_gpio(data->detect_pin, 0);

	if (data->wp_pin != GPIO_PIN_NONE)

	if (data->wp_pin != GPIO_PIN_NONE)

		at32_select_gpio(data->wp_pin, 0);

		at32_select_gpio(data->wp_pin, 0);

	}





	atmel_mci0_pclk.dev = &pdev->dev;

	atmel_mci0_pclk.dev = &pdev->dev;

drivers/mmc/host/atmel-mci.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/blkdev.h>

#include <linux/blkdev.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/ioport.h>