Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / i2c / busses / i2c-simtec.c

diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c
index 294c80f..15ac839 100644 (file)
--- a/drivers/i2c/busses/i2c-simtec.c
+++ b/drivers/i2c/busses/i2c-simtec.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 #include <linux/kernel.h>
@@ -77,10 +73,8 @@ static int simtec_i2c_probe(struct platform_device *dev)
        int ret;
 
        pd = kzalloc(sizeof(struct simtec_i2c_data), GFP_KERNEL);
-       if (pd == NULL) {
-               dev_err(&dev->dev, "cannot allocate private data\n");
+       if (pd == NULL)
                return -ENOMEM;
-       }
 
        platform_set_drvdata(dev, pd);