|
@@ -886,11 +886,8 @@ static int setup(struct spi_device *spi)
|
|
|
chip = spi_get_ctldata(spi);
|
|
|
if (!chip) {
|
|
|
chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
|
|
|
- if (!chip) {
|
|
|
- dev_err(&spi->dev,
|
|
|
- "failed setup: can't allocate chip data\n");
|
|
|
+ if (!chip)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
|
|
|
if (drv_data->ssp_type == CE4100_SSP) {
|
|
|
if (spi->chip_select > 4) {
|
|
@@ -1037,11 +1034,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
|
|
|
return NULL;
|
|
|
|
|
|
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
|
|
|
- if (!pdata) {
|
|
|
- dev_err(&pdev->dev,
|
|
|
- "failed to allocate memory for platform data\n");
|
|
|
+ if (!pdata)
|
|
|
return NULL;
|
|
|
- }
|
|
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
if (!res)
|